git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
input
/
joystick
/
analog.c
diff --git
a/drivers/input/joystick/analog.c
b/drivers/input/joystick/analog.c
index
1c0b529
..
4afe0a3
100644
(file)
--- a/
drivers/input/joystick/analog.c
+++ b/
drivers/input/joystick/analog.c
@@
-146,11
+146,11
@@
static unsigned int get_time_pit(void)
unsigned long flags;
unsigned int count;
unsigned long flags;
unsigned int count;
- spin_lock_irqsave(&i8253_lock, flags);
+
raw_
spin_lock_irqsave(&i8253_lock, flags);
outb_p(0x00, 0x43);
count = inb_p(0x40);
count |= inb_p(0x40) << 8;
outb_p(0x00, 0x43);
count = inb_p(0x40);
count |= inb_p(0x40) << 8;
- spin_unlock_irqrestore(&i8253_lock, flags);
+
raw_
spin_unlock_irqrestore(&i8253_lock, flags);
return count;
}
return count;
}