drivers/w1/slaves/w1_bq27000.c: fix the error handling in w1_bq27000_add_slave()

Use platform_device_put() instead of platform_device_unregister() if
platform_device_add() fails, and also add the return value check of
platform_device_add_data().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Greg KH <greg@kroah.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/w1/slaves/w1_bq27000.c
index 773dca5beafe7e2f7e77f3046870148c514d75ce..afbefed5f2c988fe98db5ded3c13c72479dcdf90 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;
 }