From: Oliver Neukum Date: Sat, 20 Feb 2010 00:40:54 +0000 (+0100) Subject: USB: sisusbvga: no unnecessary GFP_ATOMIC X-Git-Tag: v2.6.34-rc1~215^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=444dc54c28740d90cb2d5f38e8163bcb46c5a885;p=platform%2Fkernel%2Flinux-3.10.git USB: sisusbvga: no unnecessary GFP_ATOMIC If a driver can wait on an event, it can also use GFP_KERNEL. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 3991655..aae95a0 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c @@ -250,7 +250,7 @@ sisusb_bulkout_msg(struct sisusb_usb_data *sisusb, int index, unsigned int pipe, sisusb->urbstatus[index] |= SU_URB_BUSY; /* Submit URB */ - retval = usb_submit_urb(urb, GFP_ATOMIC); + retval = usb_submit_urb(urb, GFP_KERNEL); /* If OK, and if timeout > 0, wait for completion */ if ((retval == 0) && timeout) { @@ -306,7 +306,7 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data, urb->actual_length = 0; sisusb->completein = 0; - retval = usb_submit_urb(urb, GFP_ATOMIC); + retval = usb_submit_urb(urb, GFP_KERNEL); if (retval == 0) { wait_event_timeout(sisusb->wait_q, sisusb->completein, timeout); if (!sisusb->completein) {