Skip to content

Commit

Permalink
input: migor_ts compile and detection fix
Browse files Browse the repository at this point in the history
The i2c layer got changed while the migor_ts driver was in the input
tree waiting to get merged upstream. Fix current compile issue by using
struct i2c_client member "name" instead of "driver_name". Also, add
id_table to make sure the device gets properly detected.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Aug 11, 2008
1 parent 2fc9188 commit b6ce9ad
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/input/touchscreen/migor_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int migor_ts_probe(struct i2c_client *client,
input_set_abs_params(input, ABS_X, 95, 955, 0, 0);
input_set_abs_params(input, ABS_Y, 85, 935, 0, 0);

input->name = client->driver_name;
input->name = client->name;
input->id.bustype = BUS_I2C;
input->dev.parent = &client->dev;

Expand All @@ -192,7 +192,7 @@ static int migor_ts_probe(struct i2c_client *client,
goto err1;

error = request_irq(priv->irq, migor_ts_isr, IRQF_TRIGGER_LOW,
client->driver_name, priv);
client->name, priv);
if (error) {
dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
goto err2;
Expand Down Expand Up @@ -224,12 +224,19 @@ static int migor_ts_remove(struct i2c_client *client)
return 0;
}

static const struct i2c_device_id migor_ts_id[] = {
{ "migor_ts", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, migor_ts);

static struct i2c_driver migor_ts_driver = {
.driver = {
.name = "migor_ts",
},
.probe = migor_ts_probe,
.remove = migor_ts_remove,
.id_table = migor_ts_id,
};

static int __init migor_ts_init(void)
Expand Down

0 comments on commit b6ce9ad

Please sign in to comment.