diff options
Diffstat (limited to 'drivers/power/jz4740-battery.c')
-rw-r--r-- | drivers/power/jz4740-battery.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c index c675553d4647..d9686aa9270a 100644 --- a/drivers/power/jz4740-battery.c +++ b/drivers/power/jz4740-battery.c | |||
@@ -292,7 +292,7 @@ static int jz_battery_probe(struct platform_device *pdev) | |||
292 | jz_battery); | 292 | jz_battery); |
293 | if (ret) { | 293 | if (ret) { |
294 | dev_err(&pdev->dev, "Failed to request irq %d\n", ret); | 294 | dev_err(&pdev->dev, "Failed to request irq %d\n", ret); |
295 | goto err; | 295 | return ret; |
296 | } | 296 | } |
297 | disable_irq(jz_battery->irq); | 297 | disable_irq(jz_battery->irq); |
298 | 298 | ||
@@ -349,8 +349,6 @@ err_free_gpio: | |||
349 | gpio_free(jz_battery->pdata->gpio_charge); | 349 | gpio_free(jz_battery->pdata->gpio_charge); |
350 | err_free_irq: | 350 | err_free_irq: |
351 | free_irq(jz_battery->irq, jz_battery); | 351 | free_irq(jz_battery->irq, jz_battery); |
352 | err: | ||
353 | platform_set_drvdata(pdev, NULL); | ||
354 | return ret; | 352 | return ret; |
355 | } | 353 | } |
356 | 354 | ||