summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-04-30 15:28:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 17:04:08 -0700
commitc5cfedf234fd5ba457c404bf42b6e6aea23b1e69 (patch)
tree2e6a98dcf6ea3a1193f7836ff9a7a113efe4ca81 /drivers/w1
parent0ece1bbf4c280a4e886709ebf21d7df35a638a82 (diff)
downloadlinux-3.10-c5cfedf234fd5ba457c404bf42b6e6aea23b1e69.tar.gz
linux-3.10-c5cfedf234fd5ba457c404bf42b6e6aea23b1e69.tar.bz2
linux-3.10-c5cfedf234fd5ba457c404bf42b6e6aea23b1e69.zip
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 <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>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/slaves/w1_ds2780.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
index 7b09307de0e..98ed9c49cf5 100644
--- 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: