diff options
author | Oliver Neukum <oliver@neukum.org> | 2008-04-03 16:19:33 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-03 16:19:33 -0400 |
commit | 6eae9b0acdb6f03ed87ef882760e0ef8f440dc1a (patch) | |
tree | e3818e1b1032570aa74218aa90c532624189b9e6 | |
parent | 99de0912be6f384fc31c8e8e7ba0850d0d670385 (diff) |
Input: xpad - don't use GFP_ATOMIC
GFP_ATOMIC should not be used when GFP_KERNEL can be used.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-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 ebf8303d6f56..d4d289e75dc2 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -497,7 +497,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) | |||
497 | return 0; | 497 | return 0; |
498 | 498 | ||
499 | xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN, | 499 | xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN, |
500 | GFP_ATOMIC, &xpad->odata_dma ); | 500 | GFP_KERNEL, &xpad->odata_dma); |
501 | if (!xpad->odata) | 501 | if (!xpad->odata) |
502 | goto fail1; | 502 | goto fail1; |
503 | 503 | ||
@@ -729,7 +729,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
729 | goto fail1; | 729 | goto fail1; |
730 | 730 | ||
731 | xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN, | 731 | xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN, |
732 | GFP_ATOMIC, &xpad->idata_dma); | 732 | GFP_KERNEL, &xpad->idata_dma); |
733 | if (!xpad->idata) | 733 | if (!xpad->idata) |
734 | goto fail1; | 734 | goto fail1; |
735 | 735 | ||