diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/input/joystick/xpad.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 482cb1204e4..8a28fb7846d 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
| @@ -446,7 +446,7 @@ static void xpad_irq_in(struct urb *urb) | |||
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | exit: | 448 | exit: |
| 449 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 449 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
| 450 | if (retval) | 450 | if (retval) |
| 451 | err ("%s - usb_submit_urb failed with result %d", | 451 | err ("%s - usb_submit_urb failed with result %d", |
| 452 | __func__, retval); | 452 | __func__, retval); |
| @@ -571,7 +571,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data, | |||
| 571 | xpad->odata[6] = 0x00; | 571 | xpad->odata[6] = 0x00; |
| 572 | xpad->odata[7] = 0x00; | 572 | xpad->odata[7] = 0x00; |
| 573 | xpad->irq_out->transfer_buffer_length = 8; | 573 | xpad->irq_out->transfer_buffer_length = 8; |
| 574 | usb_submit_urb(xpad->irq_out, GFP_KERNEL); | 574 | usb_submit_urb(xpad->irq_out, GFP_ATOMIC); |
| 575 | } | 575 | } |
| 576 | 576 | ||
| 577 | return 0; | 577 | return 0; |