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

added mem_flags to usb_submit_urb().

This fixes the drivers in drivers/usb/serial.
Patch done by Oliver Neukum.
parent 9123f528
...@@ -607,7 +607,7 @@ static int __init empeg_init (void) ...@@ -607,7 +607,7 @@ static int __init empeg_init (void)
/* create our write urb pool and transfer buffers */ /* create our write urb pool and transfer buffers */
spin_lock_init (&write_urb_pool_lock); spin_lock_init (&write_urb_pool_lock);
for (i = 0; i < NUM_URBS; ++i) { for (i = 0; i < NUM_URBS; ++i) {
urb = usb_alloc_urb(0); urb = usb_alloc_urb(0, GFP_KERNEL);
write_urb_pool[i] = urb; write_urb_pool[i] = urb;
if (urb == NULL) { if (urb == NULL) {
err("No more urbs???"); err("No more urbs???");
......
...@@ -1091,7 +1091,7 @@ static int edge_open (struct usb_serial_port *port, struct file * filp) ...@@ -1091,7 +1091,7 @@ static int edge_open (struct usb_serial_port *port, struct file * filp)
} }
/* Allocate a URB for the write */ /* Allocate a URB for the write */
edge_port->write_urb = usb_alloc_urb (0); edge_port->write_urb = usb_alloc_urb (0, GFP_KERNEL);
if (!edge_port->write_urb) { if (!edge_port->write_urb) {
dbg(__FUNCTION__" - no memory"); dbg(__FUNCTION__" - no memory");
...@@ -2462,7 +2462,7 @@ static int write_cmd_usb (struct edgeport_port *edge_port, unsigned char *buffer ...@@ -2462,7 +2462,7 @@ static int write_cmd_usb (struct edgeport_port *edge_port, unsigned char *buffer
usb_serial_debug_data (__FILE__, __FUNCTION__, length, buffer); usb_serial_debug_data (__FILE__, __FUNCTION__, length, buffer);
/* Allocate our next urb */ /* Allocate our next urb */
urb = usb_alloc_urb (0); urb = usb_alloc_urb (0, GFP_KERNEL);
if (!urb) if (!urb)
return -ENOMEM; return -ENOMEM;
......
...@@ -1051,7 +1051,7 @@ static struct urb *keyspan_setup_urb(struct usb_serial *serial, int endpoint, ...@@ -1051,7 +1051,7 @@ static struct urb *keyspan_setup_urb(struct usb_serial *serial, int endpoint,
return NULL; /* endpoint not needed */ return NULL; /* endpoint not needed */
dbg (__FUNCTION__ " alloc for endpoint %d.\n", endpoint); dbg (__FUNCTION__ " alloc for endpoint %d.\n", endpoint);
urb = usb_alloc_urb(0); /* No ISO */ urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
if (urb == NULL) { if (urb == NULL) {
dbg (__FUNCTION__ " alloc for endpoint %d failed.\n", endpoint); dbg (__FUNCTION__ " alloc for endpoint %d failed.\n", endpoint);
return NULL; return NULL;
......
...@@ -280,7 +280,7 @@ static int klsi_105_startup (struct usb_serial *serial) ...@@ -280,7 +280,7 @@ static int klsi_105_startup (struct usb_serial *serial)
spin_lock_init (&priv->write_urb_pool_lock); spin_lock_init (&priv->write_urb_pool_lock);
for (i=0; i<NUM_URBS; i++) { for (i=0; i<NUM_URBS; i++) {
struct urb* urb = usb_alloc_urb(0); struct urb* urb = usb_alloc_urb(0, GFP_KERNEL);
priv->write_urb_pool[i] = urb; priv->write_urb_pool[i] = urb;
if (urb == NULL) { if (urb == NULL) {
......
...@@ -1203,7 +1203,7 @@ static void * usb_serial_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -1203,7 +1203,7 @@ static void * usb_serial_probe(struct usb_device *dev, unsigned int ifnum,
for (i = 0; i < num_bulk_in; ++i) { for (i = 0; i < num_bulk_in; ++i) {
endpoint = bulk_in_endpoint[i]; endpoint = bulk_in_endpoint[i];
port = &serial->port[i]; port = &serial->port[i];
port->read_urb = usb_alloc_urb (0); port->read_urb = usb_alloc_urb (0, GFP_KERNEL);
if (!port->read_urb) { if (!port->read_urb) {
err("No free urbs available"); err("No free urbs available");
goto probe_error; goto probe_error;
...@@ -1228,7 +1228,7 @@ static void * usb_serial_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -1228,7 +1228,7 @@ static void * usb_serial_probe(struct usb_device *dev, unsigned int ifnum,
for (i = 0; i < num_bulk_out; ++i) { for (i = 0; i < num_bulk_out; ++i) {
endpoint = bulk_out_endpoint[i]; endpoint = bulk_out_endpoint[i];
port = &serial->port[i]; port = &serial->port[i];
port->write_urb = usb_alloc_urb(0); port->write_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!port->write_urb) { if (!port->write_urb) {
err("No free urbs available"); err("No free urbs available");
goto probe_error; goto probe_error;
...@@ -1254,7 +1254,7 @@ static void * usb_serial_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -1254,7 +1254,7 @@ static void * usb_serial_probe(struct usb_device *dev, unsigned int ifnum,
for (i = 0; i < num_interrupt_in; ++i) { for (i = 0; i < num_interrupt_in; ++i) {
endpoint = interrupt_in_endpoint[i]; endpoint = interrupt_in_endpoint[i];
port = &serial->port[i]; port = &serial->port[i];
port->interrupt_in_urb = usb_alloc_urb(0); port->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!port->interrupt_in_urb) { if (!port->interrupt_in_urb) {
err("No free urbs available"); err("No free urbs available");
goto probe_error; goto probe_error;
......
...@@ -787,7 +787,7 @@ static int __init visor_init (void) ...@@ -787,7 +787,7 @@ static int __init visor_init (void)
/* create our write urb pool and transfer buffers */ /* create our write urb pool and transfer buffers */
spin_lock_init (&write_urb_pool_lock); spin_lock_init (&write_urb_pool_lock);
for (i = 0; i < NUM_URBS; ++i) { for (i = 0; i < NUM_URBS; ++i) {
urb = usb_alloc_urb(0); urb = usb_alloc_urb(0, GFP_KERNEL);
write_urb_pool[i] = urb; write_urb_pool[i] = urb;
if (urb == NULL) { if (urb == NULL) {
err("No more urbs???"); err("No more urbs???");
......
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