usb_submit_urb() changes for USB drivers that live outside of the drivers/usb subdire...

diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 4c511001e25a0e5b1afeda9e65946354f550018a..d9bfb30183aca457fccb6ffddb9dbc4dab77a019 100644 (file)
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -120,11 +120,11 @@ int hci_usb_open(struct hci_dev *hdev)
        DBG("%s", hdev->name);
 
        husb->read_urb->dev = husb->udev;
-       if ((status = usb_submit_urb(husb->read_urb)))
+       if ((status = usb_submit_urb(husb->read_urb, GFP_KERNEL)))
                DBG("read submit failed. %d", status);
 
        husb->intr_urb->dev = husb->udev;
-       if ((status = usb_submit_urb(husb->intr_urb)))
+       if ((status = usb_submit_urb(husb->intr_urb, GFP_KERNEL)))
                DBG("interrupt submit failed. %d", status);
 
        hdev->flags |= HCI_RUNNING;
@@ -428,7 +428,7 @@ static void hci_usb_bulk_read(struct urb *urb)
 
 resubmit:
        husb->read_urb->dev = husb->udev;
-       if ((status = usb_submit_urb(husb->read_urb)))
+       if ((status = usb_submit_urb(husb->read_urb, GFP_KERNEL)))
                DBG("%s read URB submit failed %d", husb->hdev.name, status);
 
        DBG("%s read URB re-submited", husb->hdev.name);
@@ -453,7 +453,7 @@ static int hci_usb_ctrl_msg(struct hci_usb *husb, struct sk_buff *skb)
        FILL_CONTROL_URB(urb, husb->udev, pipe, (void*)dr, skb->data, skb->len,
                         hci_usb_ctrl, skb);
 
-       if ((status = usb_submit_urb(urb))) {
+       if ((status = usb_submit_urb(urb, GFP_KERNEL))) {
                DBG("%s control URB submit failed %d", husb->hdev.name, status);
                return status;
        }
@@ -474,7 +474,7 @@ static int hci_usb_write_msg(struct hci_usb *husb, struct sk_buff *skb)
                      hci_usb_bulk_write, skb);
        urb->transfer_flags |= USB_QUEUE_BULK;
 
-       if ((status = usb_submit_urb(urb))) {
+       if ((status = usb_submit_urb(urb, GFP_KERNEL))) {
                DBG("%s write URB submit failed %d", husb->hdev.name, status);
                return status;
        }

diff --git a/drivers/input/joystick/iforce.c b/drivers/input/joystick/iforce.c
index bc9569fcc4dbd206fc9afb91633b11a97d1d559a..f77ec220ba30357928f657ef089bae1c3bd0e32d 100644 (file)
--- a/drivers/input/joystick/iforce.c
+++ b/drivers/input/joystick/iforce.c
@@ -204,7 +204,7 @@ static void send_packet(struct iforce *iforce, u16 cmd, unsigned char* data)
                        set_current_state(TASK_INTERRUPTIBLE);
                        add_wait_queue(&iforce->wait, &wait);
 
-                       if (usb_submit_urb(iforce->out)) {
+                       if (usb_submit_urb(iforce->out, GFP_ATOMIC)) {
                                set_current_state(TASK_RUNNING);
                                remove_wait_queue(&iforce->wait, &wait);
                                return;
@@ -289,7 +289,7 @@ static int get_id_packet(struct iforce *iforce, char *packet)
                        set_current_state(TASK_INTERRUPTIBLE);
                        add_wait_queue(&iforce->wait, &wait);
 
-                       if (usb_submit_urb(iforce->ctrl)) {
+                       if (usb_submit_urb(iforce->ctrl, GFP_ATOMIC)) {
                                set_current_state(TASK_RUNNING);
                                remove_wait_queue(&iforce->wait, &wait);
                                return -1;
@@ -345,7 +345,7 @@ static int iforce_open(struct input_dev *dev)
                        if (iforce->open++)
                                break;
                        iforce->irq->dev = iforce->usbdev;
-                       if (usb_submit_urb(iforce->irq))
+                       if (usb_submit_urb(iforce->irq, GFP_KERNEL))
                                        return -EIO;
                        break;
 #endif

diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 3c6e70880408ec63a4c437edb20ee12c602ab123..d5b7ea9750880ae1170f480484c8c92ab9050c11 100644 (file)
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -409,10 +409,10 @@ struct st5481_adapter {
  * Submit an URB with error reporting. This is a macro so
  * the __FUNCTION__ returns the caller function name.
  */
-#define SUBMIT_URB(urb) \
+#define SUBMIT_URB(urb, mem_flags) \
 ({ \
        int status; \
-       if ((status = usb_submit_urb(urb)) < 0) { \
+       if ((status = usb_submit_urb(urb, mem_flags)) < 0) { \
                WARN("usb_submit_urb failed,status=%d", status); \
        } \
         status; \

diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 06670d18003f46859aaf8b15b367470b21cd9e6f..22576dfd14f00f4f75adc696224faad438fd4cef 100644 (file)
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -115,7 +115,7 @@ static void usb_b_out(struct st5481_bcs *bcs,int buf_nr)
 
        DBG_ISO_PACKET(0x200,urb);
 
-       SUBMIT_URB(urb);
+       SUBMIT_URB(urb, GFP_KERNEL);
 }
 
 /*

diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index cd9b0389f4917bb221aaf7e72fb2aa1c21e7502a..17f670d864ee49cd9bfab99553ba9aa05d228072 100644 (file)
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -356,10 +356,10 @@ static void usb_d_out(struct st5481_adapter *adapter, int buf_nr)
 
        DBG_ISO_PACKET(0x20,urb);
 
-       if (usb_submit_urb(urb) < 0) {
+       if (usb_submit_urb(urb, GFP_KERNEL) < 0) {
                // There is another URB queued up
                urb->transfer_flags = USB_ISO_ASAP;
-               SUBMIT_URB(urb);
+               SUBMIT_URB(urb, GFP_KERNEL);
        }       
 }
 
@@ -450,7 +450,7 @@ static void dout_start_xmit(struct FsmInst *fsm, int event, void *arg)
        urb->transfer_flags = USB_ISO_ASAP;
 
        DBG_ISO_PACKET(0x20,urb);
-       SUBMIT_URB(urb);
+       SUBMIT_URB(urb, GFP_KERNEL);
 }
 
 static void dout_short_fifo(struct FsmInst *fsm, int event, void *arg)

diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index a3e776f4d3e8682fa0101dcbb21f8b4b377cfcbf..15f8dca9f431c846a33c7b03558dd9f50264860d 100644 (file)
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -48,7 +48,7 @@ static void usb_next_ctrl_msg(struct urb *urb,
        // Prepare the URB
        urb->dev = adapter->usb_dev;
 
-       SUBMIT_URB(urb);
+       SUBMIT_URB(urb, GFP_KERNEL);
 }
 
 /*
@@ -357,7 +357,7 @@ void __devinit st5481_start(struct st5481_adapter *adapter)
        adapter->leds = RED_LED; 
 
        // Start receiving on the interrupt endpoint
-       SUBMIT_URB(intr->urb); 
+       SUBMIT_URB(intr->urb, GFP_KERNEL); 
 
        while ((request = init_cmd_table[i++])) {
                value = init_cmd_table[i++];
@@ -517,7 +517,7 @@ static void usb_in_complete(struct urb *urb)
        urb->dev = in->adapter->usb_dev;
        urb->actual_length = 0;
 
-       SUBMIT_URB(urb);
+       SUBMIT_URB(urb, GFP_KERNEL);
 }
 
 int __devinit st5481_setup_in(struct st5481_in *in)
@@ -603,10 +603,10 @@ static void st5481_start_rcv(void *context)
        DBG(4,"");
 
        in->urb[0]->dev = adapter->usb_dev;
-       SUBMIT_URB(in->urb[0]);
+       SUBMIT_URB(in->urb[0], GFP_KERNEL);
 
        in->urb[1]->dev = adapter->usb_dev;
-       SUBMIT_URB(in->urb[1]);
+       SUBMIT_URB(in->urb[1], GFP_KERNEL);
 }
 
 void st5481_in_mode(struct st5481_in *in, int mode)

diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 474b05c773ea211dc15a7f97d39f6dabfbdf8b70..c3a1949f732a77ec85704dcdc819745e2d31a988 100644 (file)
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -246,13 +246,13 @@ static int cpia_usb_open(void *privdata)
        ucpia->sbuf[1].urb->next = ucpia->sbuf[0].urb;
        ucpia->sbuf[0].urb->next = ucpia->sbuf[1].urb;
        
-       err = usb_submit_urb(ucpia->sbuf[0].urb);
+       err = usb_submit_urb(ucpia->sbuf[0].urb, GFP_KERNEL);
        if (err) {
                printk(KERN_ERR "cpia_init_isoc: usb_submit_urb 0 ret %d\n",
                        err);
                goto error_urb1;
        }
-       err = usb_submit_urb(ucpia->sbuf[1].urb);
+       err = usb_submit_urb(ucpia->sbuf[1].urb, GFP_KERNEL);
        if (err) {
                printk(KERN_ERR "cpia_init_isoc: usb_submit_urb 1 ret %d\n",
                        err);

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 99682aa9a3e751f484386ec7b108647c9a466a7b..de87d319237f240a9dd87ac01c9172ce7bdf5627 100644 (file)
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -278,7 +278,7 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
        urb->transfer_flags = USB_QUEUE_BULK | USB_ASYNC_UNLINK;
        urb->timeout = MSECS_TO_JIFFIES(100);
 
-       if ((ret = usb_submit_urb(urb))) {
+       if ((ret = usb_submit_urb(urb, GFP_KERNEL))) {
                WARNING(__FUNCTION__ "(), failed Speed URB\n");
        }
        spin_unlock_irqrestore(&self->lock, flags);
@@ -451,7 +451,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
        }
        
        /* Ask USB to send the packet */
-       if ((res = usb_submit_urb(urb))) {
+       if ((res = usb_submit_urb(urb, GFP_KERNEL))) {
                WARNING(__FUNCTION__ "(), failed Tx URB\n");
                self->stats.tx_errors++;
                /* Let USB recover : We will catch that in the watchdog */
@@ -730,7 +730,7 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc
        urb->status = 0;
        urb->next = NULL;       /* Don't auto resubmit URBs */
        
-       ret = usb_submit_urb(urb);
+       ret = usb_submit_urb(urb, GFP_KERNEL);
        if (ret) {
                /* If this ever happen, we are in deep s***.
                 * Basically, the Rx path will stop... */