usb_submit_urb() changes.

Patch done by Oliver Neukum.

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 44e6cf0a9b7e6c1c71035e23450f30b441613e6a..ce9edda90ebd1143765f678a7235bd3234b48b12 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -278,7 +278,7 @@ static int bus_reset( Scsi_Cmnd *srb )
        if (us->protocol == US_PR_CBI) {
                down(&(us->irq_urb_sem));
                us->irq_urb->dev = us->pusb_dev;
-               result = usb_submit_urb(us->irq_urb);
+               result = usb_submit_urb(us->irq_urb, GFP_NOIO);
                US_DEBUGP("usb_submit_urb() returns %d\n", result);
                up(&(us->irq_urb_sem));
        }

diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 089672906f2785dc078daf94f461c48eb9d6bd8e..c9db0d21f076e0304b5cb1af872d8627b6cc549e 100644 (file)
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -414,7 +414,7 @@ int usb_stor_control_msg(struct us_data *us, unsigned int pipe,
        us->current_urb->transfer_flags = USB_ASYNC_UNLINK;
 
        /* submit the URB */
-       status = usb_submit_urb(us->current_urb);
+       status = usb_submit_urb(us->current_urb, GFP_NOIO);
        if (status) {
                /* something went wrong */
                up(&(us->current_urb_sem));
@@ -461,7 +461,7 @@ int usb_stor_bulk_msg(struct us_data *us, void *data, int pipe,
        us->current_urb->transfer_flags = USB_ASYNC_UNLINK;
 
        /* submit the URB */
-       status = usb_submit_urb(us->current_urb);
+       status = usb_submit_urb(us->current_urb, GFP_NOIO);
        if (status) {
                /* something went wrong */
                up(&(us->current_urb_sem));

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 6d93cbbe76bb4d5f572df01ed9a073010a6790fa..c3d5373ef4973bcccfba92bd3d3cb9713ec2bc41 100644 (file)
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -534,7 +534,7 @@ static int usb_stor_allocate_irq(struct us_data *ss)
                     usb_stor_CBI_irq, ss, ss->ep_int->bInterval); 
 
        /* submit the URB for processing */
-       result = usb_submit_urb(ss->irq_urb);
+       result = usb_submit_urb(ss->irq_urb, GFP_KERNEL);
        US_DEBUGP("usb_submit_urb() returns %d\n", result);
        if (result) {
                usb_free_urb(ss->irq_urb);