diff options
Diffstat (limited to 'drivers/usb/input/yealink.c')
-rw-r--r-- | drivers/usb/input/yealink.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c index 7291e7a2717b..905bf6398257 100644 --- a/drivers/usb/input/yealink.c +++ b/drivers/usb/input/yealink.c | |||
@@ -233,11 +233,10 @@ static int map_p1k_to_key(int scancode) | |||
233 | * | 233 | * |
234 | * The key parameter can be cascaded: key2 << 8 | key1 | 234 | * The key parameter can be cascaded: key2 << 8 | key1 |
235 | */ | 235 | */ |
236 | static void report_key(struct yealink_dev *yld, int key, struct pt_regs *regs) | 236 | static void report_key(struct yealink_dev *yld, int key) |
237 | { | 237 | { |
238 | struct input_dev *idev = yld->idev; | 238 | struct input_dev *idev = yld->idev; |
239 | 239 | ||
240 | input_regs(idev, regs); | ||
241 | if (yld->key_code >= 0) { | 240 | if (yld->key_code >= 0) { |
242 | /* old key up */ | 241 | /* old key up */ |
243 | input_report_key(idev, yld->key_code & 0xff, 0); | 242 | input_report_key(idev, yld->key_code & 0xff, 0); |
@@ -422,7 +421,7 @@ send_update: | |||
422 | * error,start | 421 | * error,start |
423 | * | 422 | * |
424 | */ | 423 | */ |
425 | static void urb_irq_callback(struct urb *urb, struct pt_regs *regs) | 424 | static void urb_irq_callback(struct urb *urb) |
426 | { | 425 | { |
427 | struct yealink_dev *yld = urb->context; | 426 | struct yealink_dev *yld = urb->context; |
428 | int ret; | 427 | int ret; |
@@ -439,7 +438,7 @@ static void urb_irq_callback(struct urb *urb, struct pt_regs *regs) | |||
439 | case CMD_SCANCODE: | 438 | case CMD_SCANCODE: |
440 | dbg("get scancode %x", yld->irq_data->data[0]); | 439 | dbg("get scancode %x", yld->irq_data->data[0]); |
441 | 440 | ||
442 | report_key(yld, map_p1k_to_key(yld->irq_data->data[0]), regs); | 441 | report_key(yld, map_p1k_to_key(yld->irq_data->data[0])); |
443 | break; | 442 | break; |
444 | 443 | ||
445 | default: | 444 | default: |
@@ -453,7 +452,7 @@ static void urb_irq_callback(struct urb *urb, struct pt_regs *regs) | |||
453 | err("%s - usb_submit_urb failed %d", __FUNCTION__, ret); | 452 | err("%s - usb_submit_urb failed %d", __FUNCTION__, ret); |
454 | } | 453 | } |
455 | 454 | ||
456 | static void urb_ctl_callback(struct urb *urb, struct pt_regs *regs) | 455 | static void urb_ctl_callback(struct urb *urb) |
457 | { | 456 | { |
458 | struct yealink_dev *yld = urb->context; | 457 | struct yealink_dev *yld = urb->context; |
459 | int ret; | 458 | int ret; |