diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-11-04 10:10:39 +0100 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-11-04 10:48:16 +0100 |
| commit | a01de07a85d70c1a15a0d1b078f4c649ec49c958 (patch) | |
| tree | bef64102693547e05ae23b3f99f3488f787d302e /drivers/input/misc | |
| parent | 8c52a7cf8e066d7ce202e38863c225a7d4d0bfeb (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| download | kernel_goldelico_gta04-a01de07a85d70c1a15a0d1b078f4c649ec49c958.zip kernel_goldelico_gta04-a01de07a85d70c1a15a0d1b078f4c649ec49c958.tar.gz kernel_goldelico_gta04-a01de07a85d70c1a15a0d1b078f4c649ec49c958.tar.bz2 | |
This is now Linux-3.12.0 for the GTA04!
Merge remote-tracking branch 'linus/master'
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/cm109.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 082684e..9365535 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c @@ -351,7 +351,9 @@ static void cm109_urb_irq_callback(struct urb *urb) if (status) { if (status == -ESHUTDOWN) return; - dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); + dev_err_ratelimited(&dev->intf->dev, "%s: urb status %d\n", + __func__, status); + goto out; } /* Special keys */ @@ -418,8 +420,12 @@ static void cm109_urb_ctl_callback(struct urb *urb) dev->ctl_data->byte[2], dev->ctl_data->byte[3]); - if (status) - dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status); + if (status) { + if (status == -ESHUTDOWN) + return; + dev_err_ratelimited(&dev->intf->dev, "%s: urb status %d\n", + __func__, status); + } spin_lock(&dev->ctl_submit_lock); @@ -427,7 +433,7 @@ static void cm109_urb_ctl_callback(struct urb *urb) if (likely(!dev->shutdown)) { - if (dev->buzzer_pending) { + if (dev->buzzer_pending || status) { dev->buzzer_pending = 0; dev->ctl_urb_pending = 1; cm109_submit_buzz_toggle(dev); |