diff options
| author | Dmitry Torokhov | 2014-09-04 01:01:36 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2014-09-04 01:01:36 +0200 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /drivers/input/touchscreen/ti_am335x_tsc.c | |
| parent | Input: drv260x - fix binding document (diff) | |
| parent | Linux 3.17-rc3 (diff) | |
| download | kernel-qcow2-linux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.tar.gz kernel-qcow2-linux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.tar.xz kernel-qcow2-linux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.zip | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'drivers/input/touchscreen/ti_am335x_tsc.c')
| -rw-r--r-- | drivers/input/touchscreen/ti_am335x_tsc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 4e793a17361f..2ce649520fe0 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -359,9 +359,12 @@ static int titsc_parse_dt(struct platform_device *pdev, */ err = of_property_read_u32(node, "ti,coordinate-readouts", &ts_dev->coordinate_readouts); - if (err < 0) + if (err < 0) { + dev_warn(&pdev->dev, "please use 'ti,coordinate-readouts' instead\n"); err = of_property_read_u32(node, "ti,coordiante-readouts", &ts_dev->coordinate_readouts); + } + if (err < 0) return err; |