On Thu, Aug 07, 2014 at 03:07:17PM +0100, [email protected] wrote: > From: Stephen Warren <[email protected]> > > Signed-off-by: Nick Dyer <[email protected]> > --- > drivers/input/touchscreen/atmel_mxt_ts.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c > b/drivers/input/touchscreen/atmel_mxt_ts.c > index 03b8571..da497db 100644 > --- a/drivers/input/touchscreen/atmel_mxt_ts.c > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c > @@ -1353,8 +1353,10 @@ static int mxt_get_info(struct mxt_data *data) > > static void mxt_free_object_table(struct mxt_data *data) > { > - input_unregister_device(data->input_dev); > - data->input_dev = NULL; > + if (data->input_dev) { > + input_unregister_device(data->input_dev); > + data->input_dev = NULL; > + } > > kfree(data->object_table); > data->object_table = NULL; > @@ -2194,7 +2196,6 @@ static int mxt_remove(struct i2c_client *client) > > sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); > free_irq(data->irq, data); > - input_unregister_device(data->input_dev); > mxt_free_object_table(data); > kfree(data);
No. Let's have mxt_free_object_table() only free object table, and let's call input_unregister_device() explicitly where needed, like we do in mxt_remove(). Thanks. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
