diff options
Diffstat (limited to 'drivers/input/joystick/amijoy.c')
-rw-r--r-- | drivers/input/joystick/amijoy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c index 7249d324297b..650acf3a30b7 100644 --- a/drivers/input/joystick/amijoy.c +++ b/drivers/input/joystick/amijoy.c | |||
@@ -57,7 +57,7 @@ static DEFINE_MUTEX(amijoy_mutex); | |||
57 | static struct input_dev *amijoy_dev[2]; | 57 | static struct input_dev *amijoy_dev[2]; |
58 | static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" }; | 58 | static char *amijoy_phys[2] = { "amijoy/input0", "amijoy/input1" }; |
59 | 59 | ||
60 | static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp) | 60 | static irqreturn_t amijoy_interrupt(int irq, void *dummy) |
61 | { | 61 | { |
62 | int i, data = 0, button = 0; | 62 | int i, data = 0, button = 0; |
63 | 63 | ||
@@ -69,8 +69,6 @@ static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp) | |||
69 | case 1: data = ~amiga_custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break; | 69 | case 1: data = ~amiga_custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break; |
70 | } | 70 | } |
71 | 71 | ||
72 | input_regs(amijoy_dev[i], fp); | ||
73 | |||
74 | input_report_key(amijoy_dev[i], BTN_TRIGGER, button); | 72 | input_report_key(amijoy_dev[i], BTN_TRIGGER, button); |
75 | 73 | ||
76 | input_report_abs(amijoy_dev[i], ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1)); | 74 | input_report_abs(amijoy_dev[i], ABS_X, ((data >> 1) & 1) - ((data >> 9) & 1)); |