From dba87bb43fe87905d878d215031ef184d80377ee Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Sat, 20 Feb 2010 01:40:54 +0100 Subject: [PATCH] --- yaml --- r: 185421 b: refs/heads/master c: 444dc54c28740d90cb2d5f38e8163bcb46c5a885 h: refs/heads/master i: 185419: 8a61d099cfea4eee77710922ac440129f119ba55 v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/sisusbvga/sisusb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c4a1b904ca32..ea7c95da9250 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3756c7c091f4ca8bcaf89ee3855a326d69209716 +refs/heads/master: 444dc54c28740d90cb2d5f38e8163bcb46c5a885 diff --git a/trunk/drivers/usb/misc/sisusbvga/sisusb.c b/trunk/drivers/usb/misc/sisusbvga/sisusb.c index 3991655f8f09..aae95a009bd5 100644 --- a/trunk/drivers/usb/misc/sisusbvga/sisusb.c +++ b/trunk/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) {