From bd58d595eafbd7c41a629eb74ac09f40057f9479 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 6 Jan 2013 12:46:23 -0800 Subject: [PATCH] --- yaml --- r: 350601 b: refs/heads/master c: 0853699252afdeece69c9127d57fd367d3c04a35 h: refs/heads/master i: 350599: aaf199b1ed796e07be1ef7fb9ab483ae6c765901 v: v3 --- [refs] | 2 +- trunk/drivers/power/88pm860x_battery.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 53ebaafaef08..97ca257659bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8feffd109977c045669913f4e80e8811f2212cd9 +refs/heads/master: 0853699252afdeece69c9127d57fd367d3c04a35 diff --git a/trunk/drivers/power/88pm860x_battery.c b/trunk/drivers/power/88pm860x_battery.c index 8bc80b05c63c..d338c1c4e8c8 100644 --- a/trunk/drivers/power/88pm860x_battery.c +++ b/trunk/drivers/power/88pm860x_battery.c @@ -915,15 +915,13 @@ static int pm860x_battery_probe(struct platform_device *pdev) info->irq_cc = platform_get_irq(pdev, 0); if (info->irq_cc <= 0) { dev_err(&pdev->dev, "No IRQ resource!\n"); - ret = -EINVAL; - goto out; + return -EINVAL; } info->irq_batt = platform_get_irq(pdev, 1); if (info->irq_batt <= 0) { dev_err(&pdev->dev, "No IRQ resource!\n"); - ret = -EINVAL; - goto out; + return -EINVAL; } info->chip = chip; @@ -957,7 +955,7 @@ static int pm860x_battery_probe(struct platform_device *pdev) ret = power_supply_register(&pdev->dev, &info->battery); if (ret) - goto out; + return ret; info->battery.dev->parent = &pdev->dev; ret = request_threaded_irq(info->irq_cc, NULL, @@ -984,8 +982,6 @@ static int pm860x_battery_probe(struct platform_device *pdev) free_irq(info->irq_cc, info); out_reg: power_supply_unregister(&info->battery); -out: - kfree(info); return ret; } @@ -993,10 +989,9 @@ static int pm860x_battery_remove(struct platform_device *pdev) { struct pm860x_battery_info *info = platform_get_drvdata(pdev); - power_supply_unregister(&info->battery); free_irq(info->irq_batt, info); free_irq(info->irq_cc, info); - kfree(info); + power_supply_unregister(&info->battery); platform_set_drvdata(pdev, NULL); return 0; }