Skip to content

Commit

Permalink
Input: xbox - do not use GFP_KERNEL under spinlock
Browse files Browse the repository at this point in the history
xbox_play_effect() is called while holding dev->event_lock with
interrupts disabled and thus may not use GFP_KERNEL when submitting
urbs.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Jan 10, 2010
1 parent e4e6efd commit dd38d68
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/joystick/xpad.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ static void xpad_irq_in(struct urb *urb)
}

exit:
retval = usb_submit_urb (urb, GFP_ATOMIC);
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
err ("%s - usb_submit_urb failed with result %d",
__func__, retval);
Expand Down Expand Up @@ -571,7 +571,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data,
xpad->odata[6] = 0x00;
xpad->odata[7] = 0x00;
xpad->irq_out->transfer_buffer_length = 8;
usb_submit_urb(xpad->irq_out, GFP_KERNEL);
usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
}

return 0;
Expand Down

0 comments on commit dd38d68

Please sign in to comment.