diff options
Diffstat (limited to 'drivers/input/touchscreen/wm831x-ts.c')
-rw-r--r-- | drivers/input/touchscreen/wm831x-ts.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c index 4bc851a9dc3d..e83410721e38 100644 --- a/drivers/input/touchscreen/wm831x-ts.c +++ b/drivers/input/touchscreen/wm831x-ts.c | |||
@@ -260,15 +260,16 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev) | |||
260 | * If we have a direct IRQ use it, otherwise use the interrupt | 260 | * If we have a direct IRQ use it, otherwise use the interrupt |
261 | * from the WM831x IRQ controller. | 261 | * from the WM831x IRQ controller. |
262 | */ | 262 | */ |
263 | wm831x_ts->data_irq = wm831x_irq(wm831x, | ||
264 | platform_get_irq_byname(pdev, | ||
265 | "TCHDATA")); | ||
263 | if (pdata && pdata->data_irq) | 266 | if (pdata && pdata->data_irq) |
264 | wm831x_ts->data_irq = pdata->data_irq; | 267 | wm831x_ts->data_irq = pdata->data_irq; |
265 | else | ||
266 | wm831x_ts->data_irq = platform_get_irq_byname(pdev, "TCHDATA"); | ||
267 | 268 | ||
269 | wm831x_ts->pd_irq = wm831x_irq(wm831x, | ||
270 | platform_get_irq_byname(pdev, "TCHPD")); | ||
268 | if (pdata && pdata->pd_irq) | 271 | if (pdata && pdata->pd_irq) |
269 | wm831x_ts->pd_irq = pdata->pd_irq; | 272 | wm831x_ts->pd_irq = pdata->pd_irq; |
270 | else | ||
271 | wm831x_ts->pd_irq = platform_get_irq_byname(pdev, "TCHPD"); | ||
272 | 273 | ||
273 | if (pdata) | 274 | if (pdata) |
274 | wm831x_ts->pressure = pdata->pressure; | 275 | wm831x_ts->pressure = pdata->pressure; |