evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ARM] Fix Zaurii keyboard/touchscreen drivers

Browse source 
The Zaurii drivers were partially fixed up for the IRQ register
changes, but unfortunately missed some bits, resulting in build
errors.  Fix these.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2006-10-15 13:50:02 +01:00 • committed by Russell King
parent 2326eb985b
commit 36bd262b3f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/keyboard/corgikbd.c
View file

@ -207,7 +207,7 @@ static irqreturn_t corgikbd_interrupt(int irq, void *dev_id)
static void corgikbd_timer_callback(unsigned long data) static void corgikbd_timer_callback(unsigned long data)
{ {
struct corgikbd *corgikbd_data = (struct corgikbd *) data; struct corgikbd *corgikbd_data = (struct corgikbd *) data;
corgikbd_scankeyboard(corgikbd_data, NULL); corgikbd_scankeyboard(corgikbd_data);
} }
/* /*

2
drivers/input/keyboard/locomokbd.c
View file

@ -186,7 +186,7 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
static void locomokbd_timer_callback(unsigned long data) static void locomokbd_timer_callback(unsigned long data)
{ {
struct locomokbd *locomokbd = (struct locomokbd *) data; struct locomokbd *locomokbd = (struct locomokbd *) data;
locomokbd_scankeyboard(locomokbd, NULL); locomokbd_scankeyboard(locomokbd);
} }
static int locomokbd_probe(struct locomo_dev *dev) static int locomokbd_probe(struct locomo_dev *dev)

2
drivers/input/keyboard/spitzkbd.c
View file

@ -257,7 +257,7 @@ static void spitzkbd_timer_callback(unsigned long data)
{ {
struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data; struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data;
spitzkbd_scankeyboard(spitzkbd_data, NULL); spitzkbd_scankeyboard(spitzkbd_data);
} }
/* /*

4
drivers/input/touchscreen/corgi_ts.c
View file

@ -219,7 +219,7 @@ static void ts_interrupt_main(struct corgi_ts *corgi_ts, int isTimer)
static void corgi_ts_timer(unsigned long data) static void corgi_ts_timer(unsigned long data)
{ {
struct corgi_ts *corgits_data = (struct corgi_ts *) data; struct corgi_ts *corgits_data = (struct corgi_ts *) data;
ts_interrupt_main(corgits_data, 1, NULL); ts_interrupt_main(corgits_data, 1);
} }
static irqreturn_t ts_interrupt(int irq, void *dev_id) static irqreturn_t ts_interrupt(int irq, void *dev_id)
@ -237,7 +237,7 @@ static int corgits_suspend(struct platform_device *dev, pm_message_t state)
if (corgi_ts->pendown) { if (corgi_ts->pendown) {
del_timer_sync(&corgi_ts->timer); del_timer_sync(&corgi_ts->timer);
corgi_ts->tc.pressure = 0; corgi_ts->tc.pressure = 0;
new_data(corgi_ts, NULL); new_data(corgi_ts);
corgi_ts->pendown = 0; corgi_ts->pendown = 0;
} }
corgi_ts->power_mode = PWR_MODE_SUSPEND; corgi_ts->power_mode = PWR_MODE_SUSPEND;