diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /drivers/input/joystick/xpad.c | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'drivers/input/joystick/xpad.c')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 5483fb9bd819..66be6901619d 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
| @@ -471,7 +471,7 @@ static void xpad_irq_in(struct urb *urb) | |||
| 471 | } | 471 | } |
| 472 | 472 | ||
| 473 | exit: | 473 | exit: |
| 474 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 474 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
| 475 | if (retval) | 475 | if (retval) |
| 476 | err ("%s - usb_submit_urb failed with result %d", | 476 | err ("%s - usb_submit_urb failed with result %d", |
| 477 | __func__, retval); | 477 | __func__, retval); |
| @@ -596,7 +596,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data, | |||
| 596 | xpad->odata[6] = 0x00; | 596 | xpad->odata[6] = 0x00; |
| 597 | xpad->odata[7] = 0x00; | 597 | xpad->odata[7] = 0x00; |
| 598 | xpad->irq_out->transfer_buffer_length = 8; | 598 | xpad->irq_out->transfer_buffer_length = 8; |
| 599 | usb_submit_urb(xpad->irq_out, GFP_KERNEL); | 599 | usb_submit_urb(xpad->irq_out, GFP_ATOMIC); |
| 600 | } | 600 | } |
| 601 | 601 | ||
| 602 | return 0; | 602 | return 0; |