2013-04-26 06:17:49

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH] w1: ds2780: fix the error handling in w1_ds2780_add_slave()

From: Wei Yongjun <[email protected]>

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]>
---
drivers/w1/slaves/w1_ds2780.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

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: