diff --git a/[refs] b/[refs] index aaa93f48ceab..448f4cbc2ee8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f11d018fd6f24e611e06d6aedd91c59831b3bf05 +refs/heads/master: 3f8060a5fe1825dce3bf9870f4bef964fe6374c9 diff --git a/trunk/drivers/power/88pm860x_charger.c b/trunk/drivers/power/88pm860x_charger.c index 4b37a5af8deb..36fb4b5a4b0d 100644 --- a/trunk/drivers/power/88pm860x_charger.c +++ b/trunk/drivers/power/88pm860x_charger.c @@ -714,7 +714,6 @@ static int pm860x_charger_probe(struct platform_device *pdev) while (--i >= 0) free_irq(info->irq[i], info); out: - kfree(info); return ret; } @@ -728,7 +727,6 @@ static int pm860x_charger_remove(struct platform_device *pdev) free_irq(info->irq[0], info); for (i = 0; i < info->irq_nums; i++) free_irq(info->irq[i], info); - kfree(info); return 0; }