[PATCH] Corgi Keyboard: Fix a couple of compile errors
Fix a couple of compile errors in the corgi keyboard driver. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
4bc20a8d49
commit
aba5a4c055
@ -235,7 +235,7 @@ static void corgikbd_hinge_timer(unsigned long data)
|
|||||||
unsigned long gprr;
|
unsigned long gprr;
|
||||||
unsigned long flags;
|
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) {
|
if (gprr != sharpsl_hinge_state) {
|
||||||
hinge_count = 0;
|
hinge_count = 0;
|
||||||
sharpsl_hinge_state = gprr;
|
sharpsl_hinge_state = gprr;
|
||||||
@ -267,7 +267,7 @@ static int __init corgikbd_probe(struct device *dev)
|
|||||||
dev_set_drvdata(dev,corgikbd);
|
dev_set_drvdata(dev,corgikbd);
|
||||||
strcpy(corgikbd->phys, "corgikbd/input0");
|
strcpy(corgikbd->phys, "corgikbd/input0");
|
||||||
|
|
||||||
spin_lock_init(corgikbd->lock);
|
spin_lock_init(&corgikbd->lock);
|
||||||
|
|
||||||
/* Init Keyboard rescan timer */
|
/* Init Keyboard rescan timer */
|
||||||
init_timer(&corgikbd->timer);
|
init_timer(&corgikbd->timer);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user