From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 30 Apr 2013 22:28:36 +0000 (-0700)
Subject: drivers/w1/slaves/w1_ds2780.c: fix the error handling in w1_ds2780_add_slave()
X-Git-Tag: upstream/snapshot3+hdmi~5241^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5cfedf234fd5ba457c404bf42b6e6aea23b1e69;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
index 7b09307..98ed9c4 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: