drivers/w1/slaves/w1_ds2780.c: fix the error handling in w1_ds2780_add_slave()

Use platform_device_put() instead of platform_device_unregister() if
platform_device_add() fail, and platform_device_del() should be used in
the error handling case after platform_device_add() success.

Signed-off-by: Wei Yongjun <[email protected]>
Cc: Evgeniy Polyakov <[email protected]>
Cc: Greg KH <[email protected]>
Cc: Neil Brown <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
index 7b09307de0ef418f7f670038f7a3e5a923ff4f3c..98ed9c49cf5056242ac3a976fcb97de99a2ef265 100644 (file)
--- a/drivers/w1/slaves/w1_ds2780.c
+++ b/drivers/w1/slaves/w1_ds2780.c
@@ -141,8 +141,9 @@ static int w1_ds2780_add_slave(struct w1_slave *sl)
        return 0;
 
 bin_attr_failed:
+       platform_device_del(pdev);
 pdev_add_failed:
-       platform_device_unregister(pdev);
+       platform_device_put(pdev);
 pdev_alloc_failed:
        ida_simple_remove(&bat_ida, id);
 noid: