diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index a97905a17b72..2accf1dffee9 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c | |||
@@ -814,10 +814,6 @@ static int mxt_initialize(struct mxt_data *data) | |||
814 | if (error) | 814 | if (error) |
815 | return error; | 815 | return error; |
816 | 816 | ||
817 | error = mxt_make_highchg(data); | ||
818 | if (error) | ||
819 | return error; | ||
820 | |||
821 | mxt_handle_pdata(data); | 817 | mxt_handle_pdata(data); |
822 | 818 | ||
823 | /* Backup to memory */ | 819 | /* Backup to memory */ |
@@ -1005,6 +1001,10 @@ static ssize_t mxt_update_fw_store(struct device *dev, | |||
1005 | 1001 | ||
1006 | enable_irq(data->irq); | 1002 | enable_irq(data->irq); |
1007 | 1003 | ||
1004 | error = mxt_make_highchg(data); | ||
1005 | if (error) | ||
1006 | return error; | ||
1007 | |||
1008 | return count; | 1008 | return count; |
1009 | } | 1009 | } |
1010 | 1010 | ||
@@ -1115,6 +1115,10 @@ static int __devinit mxt_probe(struct i2c_client *client, | |||
1115 | goto err_free_object; | 1115 | goto err_free_object; |
1116 | } | 1116 | } |
1117 | 1117 | ||
1118 | error = mxt_make_highchg(data); | ||
1119 | if (error) | ||
1120 | goto err_free_irq; | ||
1121 | |||
1118 | error = input_register_device(input_dev); | 1122 | error = input_register_device(input_dev); |
1119 | if (error) | 1123 | if (error) |
1120 | goto err_free_irq; | 1124 | goto err_free_irq; |