xfs: check correct status variable for xfs_inobt_get_rec() call

[firefly-linux-kernel-4.4.55.git] / drivers / power / jz4740-battery.c

diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index c675553d46473a7f299440b2ec85f6735770c91e..d9686aa9270a0b2732292e75b38c57ea32d1c064 100644 (file)
--- 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)
                        jz_battery);
        if (ret) {
                dev_err(&pdev->dev, "Failed to request irq %d\n", ret);
-               goto err;
+               return ret;
        }
        disable_irq(jz_battery->irq);
 
@@ -349,8 +349,6 @@ err_free_gpio:
                gpio_free(jz_battery->pdata->gpio_charge);
 err_free_irq:
        free_irq(jz_battery->irq, jz_battery);
-err:
-       platform_set_drvdata(pdev, NULL);
        return ret;
 }