diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-20 14:38:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 14:38:55 +0200 |
| commit | dfacc4d6c98b89609250269f518c1f54c30454ef (patch) | |
| tree | e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a /drivers/input/joystick/analog.c | |
| parent | f869097e884d8cb65b2bb7831ca57b7dffb66fdd (diff) | |
| parent | 85cb68b27c428d477169f3aa46c72dba103a17bd (diff) | |
| download | talos-obmc-linux-dfacc4d6c98b89609250269f518c1f54c30454ef.tar.gz talos-obmc-linux-dfacc4d6c98b89609250269f518c1f54c30454ef.zip | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'drivers/input/joystick/analog.c')
| -rw-r--r-- | drivers/input/joystick/analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 1c0b529c06aa..4afe0a3b4884 100644 --- 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; - 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; - spin_unlock_irqrestore(&i8253_lock, flags); + raw_spin_unlock_irqrestore(&i8253_lock, flags); return count; } |
