Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / w1 / slaves / w1_bq27000.c

diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/w1/slaves/w1_bq27000.c
index 773dca5..afbefed 100644 (file)
--- a/drivers/w1/slaves/w1_bq27000.c
+++ b/drivers/w1/slaves/w1_bq27000.c
@@ -57,6 +57,8 @@ static int w1_bq27000_add_slave(struct w1_slave *sl)
        ret = platform_device_add_data(pdev,
                                       &bq27000_battery_info,
                                       sizeof(bq27000_battery_info));
+       if (ret)
+               goto pdev_add_failed;
        pdev->dev.parent = &sl->dev;
 
        ret = platform_device_add(pdev);
@@ -68,7 +70,7 @@ static int w1_bq27000_add_slave(struct w1_slave *sl)
        goto success;
 
 pdev_add_failed:
-       platform_device_unregister(pdev);
+       platform_device_put(pdev);
 success:
        return ret;
 }