Skip to content

Commit

Permalink
drivers/w1/slaves/w1_ds2780.c: fix the error handling in w1_ds2780_ad…
Browse files Browse the repository at this point in the history
…d_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 <[email protected]>
Cc: Evgeniy Polyakov <[email protected]>
Cc: Greg KH <[email protected]>
Cc: Neil Brown <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Wei Yongjun authored and torvalds committed May 1, 2013
1 parent 0ece1bb commit c5cfedf
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/w1/slaves/w1_ds2780.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit c5cfedf

Please sign in to comment.