iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] input: fix ucb1x00-ts breakage after conversion to dynamic input_dev allocation

Browse Source 
The bd62266319 commit broke the UCB1x00
touchscreen driver since the idev structure was assumed to be into the ts
structure, simply casting the former to the later in a couple places.

This patch fixes those, and also cache the idev pointer between multiple
calls to input_report_abs() to avoid growing the compiled code needlessly.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nicolas Pitre 2005-12-12 00:37:36 -08:00 committed by Linus Torvalds
parent 68799398ce
commit 1393c3edc3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mfd/ucb1x00-ts.c
View File

@ -59,16 +59,18 @@ static int adcsync;
static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y) static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y)
{ {
input_report_abs(ts->idev, ABS_X, x); struct input_dev *idev = ts->idev;
input_report_abs(ts->idev, ABS_Y, y); input_report_abs(idev, ABS_X, x);
input_report_abs(ts->idev, ABS_PRESSURE, pressure); input_report_abs(idev, ABS_Y, y);
input_sync(ts->idev); input_report_abs(idev, ABS_PRESSURE, pressure);
input_sync(idev);
} }
static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts) static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts)
{ {
input_report_abs(ts->idev, ABS_PRESSURE, 0); struct input_dev *idev = ts->idev;
input_sync(ts->idev); input_report_abs(idev, ABS_PRESSURE, 0);
input_sync(idev);
} }
/* /*
@ -297,7 +299,7 @@ static void ucb1x00_ts_irq(int idx, void *id)
static int ucb1x00_ts_open(struct input_dev *idev) static int ucb1x00_ts_open(struct input_dev *idev)
{ {
struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev; struct ucb1x00_ts *ts = idev->private;
int ret = 0; int ret = 0;
BUG_ON(ts->rtask); BUG_ON(ts->rtask);
@ -334,7 +336,7 @@ static int ucb1x00_ts_open(struct input_dev *idev)
*/ */
static void ucb1x00_ts_close(struct input_dev *idev) static void ucb1x00_ts_close(struct input_dev *idev)
{ {
struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev; struct ucb1x00_ts *ts = idev->private;
if (ts->rtask) if (ts->rtask)
kthread_stop(ts->rtask); kthread_stop(ts->rtask);
@ -386,6 +388,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
ts->ucb = dev->ucb; ts->ucb = dev->ucb;
ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
ts->idev->private = ts;
ts->idev->name = "Touchscreen panel"; ts->idev->name = "Touchscreen panel";
ts->idev->id.product = ts->ucb->id; ts->idev->id.product = ts->ucb->id;
ts->idev->open = ucb1x00_ts_open; ts->idev->open = ucb1x00_ts_open;