提交 0ece1bbf 编写于 作者: W Wei Yongjun 提交者: Linus Torvalds

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: NWei 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 8d46fa11
...@@ -57,6 +57,8 @@ static int w1_bq27000_add_slave(struct w1_slave *sl) ...@@ -57,6 +57,8 @@ static int w1_bq27000_add_slave(struct w1_slave *sl)
ret = platform_device_add_data(pdev, ret = platform_device_add_data(pdev,
&bq27000_battery_info, &bq27000_battery_info,
sizeof(bq27000_battery_info)); sizeof(bq27000_battery_info));
if (ret)
goto pdev_add_failed;
pdev->dev.parent = &sl->dev; pdev->dev.parent = &sl->dev;
ret = platform_device_add(pdev); ret = platform_device_add(pdev);
...@@ -68,7 +70,7 @@ static int w1_bq27000_add_slave(struct w1_slave *sl) ...@@ -68,7 +70,7 @@ static int w1_bq27000_add_slave(struct w1_slave *sl)
goto success; goto success;
pdev_add_failed: pdev_add_failed:
platform_device_unregister(pdev); platform_device_put(pdev);
success: success:
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册