From c5cfedf234fd5ba457c404bf42b6e6aea23b1e69 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 30 Apr 2013 15:28:36 -0700 Subject: 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 Cc: Evgeniy Polyakov Cc: Greg KH Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/w1/slaves/w1_ds2780.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/w1/slaves') 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: -- cgit v1.2.3-18-g5258