Commit c28d6f2d authored Apr 30, 2013 by Wei Yongjun Committed by Linus Torvalds Apr 30, 2013

drivers/w1/slaves/w1_ds2781.c: fix the error handling in w1_ds2781_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>

parent c5cfedf2

drivers/w1/slaves/w1_ds2781.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -139,8 +139,9 @@ static int w1_ds2781_add_slave(struct w1_slave *sl)
	return 0;		return 0;

	bin_attr_failed:		bin_attr_failed:
			platform_device_del(pdev);
	pdev_add_failed:		pdev_add_failed:
	platform_device_unregister(pdev);		platform_device_put(pdev);
	pdev_alloc_failed:		pdev_alloc_failed:
	ida_simple_remove(&bat_ida, id);		ida_simple_remove(&bat_ida, id);
	noid:		noid: