On Thu, 2010-09-02 at 16:27 +0800, Axel Lin wrote: > Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx> > --- > drivers/input/touchscreen/wm97xx-core.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c > index cbfef1e..770537c 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) > touch_reg_err: > platform_device_put(wm->touch_dev); > touch_err: > - platform_device_unregister(wm->battery_dev); > - wm->battery_dev = NULL; > + platform_device_del(wm->battery_dev); > batt_reg_err: > platform_device_put(wm->battery_dev); > batt_err: Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx> -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
