diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-30 15:28:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 17:04:08 -0700 |
| commit | 4d10e0f2dd42b950448c13715f88edfce82a0975 (patch) | |
| tree | c0b2d411e835907bd6f30869268607cfa7e74d2c /drivers/w1 | |
| parent | c28d6f2ddb10fd2b359083e89ae583c6c062e35f (diff) | |
| download | linux-3.10-4d10e0f2dd42b950448c13715f88edfce82a0975.tar.gz linux-3.10-4d10e0f2dd42b950448c13715f88edfce82a0975.tar.bz2 linux-3.10-4d10e0f2dd42b950448c13715f88edfce82a0975.zip | |
drivers/w1/slaves/w1_ds2760.c: fix the error handling in w1_ds2760_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_ds2760.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index aa7bd5fa2fa..e86a69dc411 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c @@ -148,8 +148,9 @@ static int w1_ds2760_add_slave(struct w1_slave *sl) goto success; 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: |