aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/keyboard/corgikbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 7719bdfa9eea..a31c3d64af32 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -235,7 +235,7 @@ static void corgikbd_hinge_timer(unsigned long data)
235 unsigned long gprr; 235 unsigned long gprr;
236 unsigned long flags; 236 unsigned long flags;
237 237
238 gprr = read_scoop_reg(SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB); 238 gprr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB);
239 if (gprr != sharpsl_hinge_state) { 239 if (gprr != sharpsl_hinge_state) {
240 hinge_count = 0; 240 hinge_count = 0;
241 sharpsl_hinge_state = gprr; 241 sharpsl_hinge_state = gprr;
@@ -267,7 +267,7 @@ static int __init corgikbd_probe(struct device *dev)
267 dev_set_drvdata(dev,corgikbd); 267 dev_set_drvdata(dev,corgikbd);
268 strcpy(corgikbd->phys, "corgikbd/input0"); 268 strcpy(corgikbd->phys, "corgikbd/input0");
269 269
270 spin_lock_init(corgikbd->lock); 270 spin_lock_init(&corgikbd->lock);
271 271
272 /* Init Keyboard rescan timer */ 272 /* Init Keyboard rescan timer */
273 init_timer(&corgikbd->timer); 273 init_timer(&corgikbd->timer);