diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:14:47 -0500 |
| commit | a1be621dfacbef0fd374d8acd553d71e07bf29ac (patch) | |
| tree | 32b0355454b43b1098b5e01dd699fd7281abf781 /drivers/input/touchscreen/tsc2007.c | |
| parent | 3612fdf780e28b10323dd12d2b0f306c7ada4d4c (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
Diffstat (limited to 'drivers/input/touchscreen/tsc2007.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc2007.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index b75dc2990574..4ab070246892 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
| @@ -289,7 +289,8 @@ static int tsc2007_probe(struct i2c_client *client, | |||
| 289 | 289 | ||
| 290 | pdata->init_platform_hw(); | 290 | pdata->init_platform_hw(); |
| 291 | 291 | ||
| 292 | snprintf(ts->phys, sizeof(ts->phys), "%s/input0", client->dev.bus_id); | 292 | snprintf(ts->phys, sizeof(ts->phys), |
| 293 | "%s/input0", dev_name(&client->dev)); | ||
| 293 | 294 | ||
| 294 | input_dev->name = "TSC2007 Touchscreen"; | 295 | input_dev->name = "TSC2007 Touchscreen"; |
| 295 | input_dev->phys = ts->phys; | 296 | input_dev->phys = ts->phys; |