diff options
author | Oliver Neukum <oliver@neukum.org> | 2010-02-19 19:40:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:55:14 -0500 |
commit | 444dc54c28740d90cb2d5f38e8163bcb46c5a885 (patch) | |
tree | 6da3a9fc39a88f0b813ff9e7a9c3af469e100ae0 /drivers/usb/misc/sisusbvga/sisusb.c | |
parent | 3756c7c091f4ca8bcaf89ee3855a326d69209716 (diff) |
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 <neukum@b1-systems.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb.c')
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index 3991655f8f09..aae95a009bd5 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, | |||
250 | sisusb->urbstatus[index] |= SU_URB_BUSY; | 250 | sisusb->urbstatus[index] |= SU_URB_BUSY; |
251 | 251 | ||
252 | /* Submit URB */ | 252 | /* Submit URB */ |
253 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 253 | retval = usb_submit_urb(urb, GFP_KERNEL); |
254 | 254 | ||
255 | /* If OK, and if timeout > 0, wait for completion */ | 255 | /* If OK, and if timeout > 0, wait for completion */ |
256 | if ((retval == 0) && timeout) { | 256 | if ((retval == 0) && timeout) { |
@@ -306,7 +306,7 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data, | |||
306 | urb->actual_length = 0; | 306 | urb->actual_length = 0; |
307 | 307 | ||
308 | sisusb->completein = 0; | 308 | sisusb->completein = 0; |
309 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 309 | retval = usb_submit_urb(urb, GFP_KERNEL); |
310 | if (retval == 0) { | 310 | if (retval == 0) { |
311 | wait_event_timeout(sisusb->wait_q, sisusb->completein, timeout); | 311 | wait_event_timeout(sisusb->wait_q, sisusb->completein, timeout); |
312 | if (!sisusb->completein) { | 312 | if (!sisusb->completein) { |