Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ece1bbf authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Torvalds
Browse files

drivers/w1/slaves/w1_bq27000.c: fix the error handling in w1_bq27000_add_slave() 



Use platform_device_put() instead of platform_device_unregister() if
platform_device_add() fails, and also add the return value check of
platform_device_add_data().

Signed-off-by: default avatarWei 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d46fa11

drivers/w1/slaves/w1_bq27000.c

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ static int w1_bq27000_add_slave(struct w1_slave *sl) 
	ret = platform_device_add_data(pdev,

				       &bq27000_battery_info,

				       sizeof(bq27000_battery_info));

	if (ret)

		goto pdev_add_failed;

	pdev->dev.parent = &sl->dev;



	ret = platform_device_add(pdev);
@@ -68,7 +70,7 @@ static int w1_bq27000_add_slave(struct w1_slave *sl) 
	goto success;



pdev_add_failed:

	platform_device_unregister(pdev);

	platform_device_put(pdev);

success:

	return ret;

}