aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-09-03 13:31:04 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-05 15:12:57 -0400
commitd3622e6f05b2134deb5ba8ca2f6bcce5391e7e6d (patch)
tree2155e3ed454c2d8baa7d128eb3da72345dcb17b2 /drivers/input
parentcdd194779b72fe6d5e1b5b67ef57a0fddbd60eac (diff)
Input: wm97xx-core - simplify error path in wm97xx_probe()
Use platform_device_del() instead of platform_device_unregister() in error handling path. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Acked-by: Mark Brown <broonie@opensoruce.wolfsonmicro.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/wm97xx-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index cbfef1ea7e30..770537c14628 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -684,8 +684,7 @@ static int wm97xx_probe(struct device *dev)
684 touch_reg_err: 684 touch_reg_err:
685 platform_device_put(wm->touch_dev); 685 platform_device_put(wm->touch_dev);
686 touch_err: 686 touch_err:
687 platform_device_unregister(wm->battery_dev); 687 platform_device_del(wm->battery_dev);
688 wm->battery_dev = NULL;
689 batt_reg_err: 688 batt_reg_err:
690 platform_device_put(wm->battery_dev); 689 platform_device_put(wm->battery_dev);
691 batt_err: 690 batt_err: