diff options
Diffstat (limited to 'drivers/usb/input/powermate.c')
-rw-r--r-- | drivers/usb/input/powermate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c index f0f8db6810a2..0bf91778c40d 100644 --- a/drivers/usb/input/powermate.c +++ b/drivers/usb/input/powermate.c | |||
@@ -80,10 +80,10 @@ struct powermate_device { | |||
80 | static char pm_name_powermate[] = "Griffin PowerMate"; | 80 | static char pm_name_powermate[] = "Griffin PowerMate"; |
81 | static char pm_name_soundknob[] = "Griffin SoundKnob"; | 81 | static char pm_name_soundknob[] = "Griffin SoundKnob"; |
82 | 82 | ||
83 | static void powermate_config_complete(struct urb *urb, struct pt_regs *regs); | 83 | static void powermate_config_complete(struct urb *urb); |
84 | 84 | ||
85 | /* Callback for data arriving from the PowerMate over the USB interrupt pipe */ | 85 | /* Callback for data arriving from the PowerMate over the USB interrupt pipe */ |
86 | static void powermate_irq(struct urb *urb, struct pt_regs *regs) | 86 | static void powermate_irq(struct urb *urb) |
87 | { | 87 | { |
88 | struct powermate_device *pm = urb->context; | 88 | struct powermate_device *pm = urb->context; |
89 | int retval; | 89 | int retval; |
@@ -104,7 +104,6 @@ static void powermate_irq(struct urb *urb, struct pt_regs *regs) | |||
104 | } | 104 | } |
105 | 105 | ||
106 | /* handle updates to device state */ | 106 | /* handle updates to device state */ |
107 | input_regs(pm->input, regs); | ||
108 | input_report_key(pm->input, BTN_0, pm->data[0] & 0x01); | 107 | input_report_key(pm->input, BTN_0, pm->data[0] & 0x01); |
109 | input_report_rel(pm->input, REL_DIAL, pm->data[1]); | 108 | input_report_rel(pm->input, REL_DIAL, pm->data[1]); |
110 | input_sync(pm->input); | 109 | input_sync(pm->input); |
@@ -191,7 +190,7 @@ static void powermate_sync_state(struct powermate_device *pm) | |||
191 | } | 190 | } |
192 | 191 | ||
193 | /* Called when our asynchronous control message completes. We may need to issue another immediately */ | 192 | /* Called when our asynchronous control message completes. We may need to issue another immediately */ |
194 | static void powermate_config_complete(struct urb *urb, struct pt_regs *regs) | 193 | static void powermate_config_complete(struct urb *urb) |
195 | { | 194 | { |
196 | struct powermate_device *pm = urb->context; | 195 | struct powermate_device *pm = urb->context; |
197 | unsigned long flags; | 196 | unsigned long flags; |