From 0ae64773170ed46beff71c8bfafb3c54271ce769 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 6 Sep 2005 15:18:59 -0700 Subject: [PATCH] --- yaml --- r: 7475 b: refs/heads/master c: aba5a4c055dde13a3cece53e1b4b060294d631ed h: refs/heads/master i: 7473: 17dee8ad1be2cf21d1141325099bb65c020f595a 7471: 816a7212a73ab17048c48640362d2b538179c2fe v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/corgikbd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9d0a465ef953..6b66d3eee370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bc20a8d497e137c0a9ee9a3bacce3dd4a2b6993 +refs/heads/master: aba5a4c055dde13a3cece53e1b4b060294d631ed diff --git a/trunk/drivers/input/keyboard/corgikbd.c b/trunk/drivers/input/keyboard/corgikbd.c index 7719bdfa9eea..a31c3d64af32 100644 --- a/trunk/drivers/input/keyboard/corgikbd.c +++ b/trunk/drivers/input/keyboard/corgikbd.c @@ -235,7 +235,7 @@ static void corgikbd_hinge_timer(unsigned long data) unsigned long gprr; unsigned long flags; - gprr = read_scoop_reg(SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB); + gprr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB); if (gprr != sharpsl_hinge_state) { hinge_count = 0; sharpsl_hinge_state = gprr; @@ -267,7 +267,7 @@ static int __init corgikbd_probe(struct device *dev) dev_set_drvdata(dev,corgikbd); strcpy(corgikbd->phys, "corgikbd/input0"); - spin_lock_init(corgikbd->lock); + spin_lock_init(&corgikbd->lock); /* Init Keyboard rescan timer */ init_timer(&corgikbd->timer);