Commit 1ce27f88 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Paul Mackerras

added mem_flags to usb_submit_urb().

Fixes drivers/usb/storage.
Patch done by Oliver Neukum.
parent dd20f0da
...@@ -515,7 +515,7 @@ static int usb_stor_allocate_irq(struct us_data *ss) ...@@ -515,7 +515,7 @@ static int usb_stor_allocate_irq(struct us_data *ss)
down(&(ss->irq_urb_sem)); down(&(ss->irq_urb_sem));
/* allocate the URB */ /* allocate the URB */
ss->irq_urb = usb_alloc_urb(0); ss->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!ss->irq_urb) { if (!ss->irq_urb) {
up(&(ss->irq_urb_sem)); up(&(ss->irq_urb_sem));
US_DEBUGP("couldn't allocate interrupt URB"); US_DEBUGP("couldn't allocate interrupt URB");
...@@ -730,7 +730,7 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -730,7 +730,7 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum,
} }
/* allocate the URB we're going to use */ /* allocate the URB we're going to use */
ss->current_urb = usb_alloc_urb(0); ss->current_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!ss->current_urb) { if (!ss->current_urb) {
usb_dec_dev_use(dev); usb_dec_dev_use(dev);
return NULL; return NULL;
...@@ -756,7 +756,7 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -756,7 +756,7 @@ static void * storage_probe(struct usb_device *dev, unsigned int ifnum,
memset(ss, 0, sizeof(struct us_data)); memset(ss, 0, sizeof(struct us_data));
/* allocate the URB we're going to use */ /* allocate the URB we're going to use */
ss->current_urb = usb_alloc_urb(0); ss->current_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!ss->current_urb) { if (!ss->current_urb) {
kfree(ss); kfree(ss);
usb_dec_dev_use(dev); usb_dec_dev_use(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment