diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 09:25:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 09:25:31 -0700 |
| commit | 71c4c8b7c3bdeccef4f478c643a9ff382ec07241 (patch) | |
| tree | 0653596f04e14976e717398543a958b4567bb8a9 /drivers/input/joystick | |
| parent | 3730793d457fed79a6d49bae72996d458c8e4f2d (diff) | |
| parent | 032e46cbf5fb1d768d7dec5631c224e22b4be46f (diff) | |
| download | linux-3.10-71c4c8b7c3bdeccef4f478c643a9ff382ec07241.tar.gz linux-3.10-71c4c8b7c3bdeccef4f478c643a9ff382ec07241.tar.bz2 linux-3.10-71c4c8b7c3bdeccef4f478c643a9ff382ec07241.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: atkbd - add force relese key quirk for Soltech TA12
Input: fix EVIOCGNAME/JSIOCGNAME regression
Input: atkbd - add forced release keys quirk for FSC Amilo Pi 3525
Input: pcspkr - switch driver to dev_pm_ops
Input: xpad - don't resend successfully sent outgoing requests
Input: wistron_btns - recognize Maxdata Pro 7000 notebooks
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index b868b8d5fbb..f155ad8cdae 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -470,20 +470,20 @@ static void xpad_irq_out(struct urb *urb) status = urb->status; switch (status) { - case 0: + case 0: /* success */ - break; - case -ECONNRESET: - case -ENOENT: - case -ESHUTDOWN: - /* this urb is terminated, clean up */ - dbg("%s - urb shutting down with status: %d", - __func__, status); - return; - default: - dbg("%s - nonzero urb status received: %d", - __func__, status); - goto exit; + return; + + case -ECONNRESET: + case -ENOENT: + case -ESHUTDOWN: + /* this urb is terminated, clean up */ + dbg("%s - urb shutting down with status: %d", __func__, status); + return; + + default: + dbg("%s - nonzero urb status received: %d", __func__, status); + goto exit; } exit: |