diff options
| -rw-r--r-- | drivers/input/touchscreen/migor_ts.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c index c1cd99d58981..504ca11749a1 100644 --- a/drivers/input/touchscreen/migor_ts.c +++ b/drivers/input/touchscreen/migor_ts.c | |||
| @@ -173,7 +173,7 @@ static int migor_ts_probe(struct i2c_client *client, | |||
| 173 | input_set_abs_params(input, ABS_X, 95, 955, 0, 0); | 173 | input_set_abs_params(input, ABS_X, 95, 955, 0, 0); |
| 174 | input_set_abs_params(input, ABS_Y, 85, 935, 0, 0); | 174 | input_set_abs_params(input, ABS_Y, 85, 935, 0, 0); |
| 175 | 175 | ||
| 176 | input->name = client->driver_name; | 176 | input->name = client->name; |
| 177 | input->id.bustype = BUS_I2C; | 177 | input->id.bustype = BUS_I2C; |
| 178 | input->dev.parent = &client->dev; | 178 | input->dev.parent = &client->dev; |
| 179 | 179 | ||
| @@ -192,7 +192,7 @@ static int migor_ts_probe(struct i2c_client *client, | |||
| 192 | goto err1; | 192 | goto err1; |
| 193 | 193 | ||
| 194 | error = request_irq(priv->irq, migor_ts_isr, IRQF_TRIGGER_LOW, | 194 | error = request_irq(priv->irq, migor_ts_isr, IRQF_TRIGGER_LOW, |
| 195 | client->driver_name, priv); | 195 | client->name, priv); |
| 196 | if (error) { | 196 | if (error) { |
| 197 | dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); | 197 | dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); |
| 198 | goto err2; | 198 | goto err2; |
| @@ -224,12 +224,19 @@ static int migor_ts_remove(struct i2c_client *client) | |||
| 224 | return 0; | 224 | return 0; |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | static const struct i2c_device_id migor_ts_id[] = { | ||
| 228 | { "migor_ts", 0 }, | ||
| 229 | { } | ||
| 230 | }; | ||
| 231 | MODULE_DEVICE_TABLE(i2c, migor_ts); | ||
| 232 | |||
| 227 | static struct i2c_driver migor_ts_driver = { | 233 | static struct i2c_driver migor_ts_driver = { |
| 228 | .driver = { | 234 | .driver = { |
| 229 | .name = "migor_ts", | 235 | .name = "migor_ts", |
| 230 | }, | 236 | }, |
| 231 | .probe = migor_ts_probe, | 237 | .probe = migor_ts_probe, |
| 232 | .remove = migor_ts_remove, | 238 | .remove = migor_ts_remove, |
| 239 | .id_table = migor_ts_id, | ||
| 233 | }; | 240 | }; |
| 234 | 241 | ||
| 235 | static int __init migor_ts_init(void) | 242 | static int __init migor_ts_init(void) |
