# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.220.2.4 -> 1.220.2.5 # drivers/usb/serial/kl5kusb105.c 1.1 -> 1.2 # drivers/usb/serial/belkin_sa.c 1.16 -> 1.17 # drivers/usb/serial/io_edgeport.c 1.20 -> 1.21 # drivers/usb/serial/keyspan_pda.c 1.11 -> 1.12 # drivers/usb/serial/keyspan.c 1.18 -> 1.19 # drivers/usb/serial/mct_u232.c 1.18 -> 1.19 # drivers/usb/serial/ftdi_sio.c 1.22 -> 1.23 # drivers/usb/serial/ipaq.c 1.1 -> 1.2 # drivers/usb/serial/visor.c 1.21 -> 1.22 # drivers/usb/serial/omninet.c 1.14 -> 1.15 # drivers/usb/serial/whiteheat.c 1.13 -> 1.14 # drivers/usb/serial/cyberjack.c 1.9 -> 1.10 # drivers/usb/serial/usbserial.c 1.22 -> 1.23 # drivers/usb/serial/empeg.c 1.18 -> 1.19 # drivers/usb/serial/pl2303.c 1.9 -> 1.10 # drivers/usb/serial/ir-usb.c 1.8 -> 1.9 # drivers/usb/serial/digi_acceleport.c 1.14 -> 1.15 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/02/06 greg@soap.kroah.net 1.220.2.5 # usb_submit_urb() changes for all drivers/usb/serial/*.c drivers # -------------------------------------------- # diff -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c --- a/drivers/usb/serial/belkin_sa.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/belkin_sa.c Wed Feb 6 20:48:24 2002 @@ -217,14 +217,14 @@ * enhance buffering. Win trace shows 16 initial read URBs. */ port->read_urb->dev = port->serial->dev; - retval = usb_submit_urb(port->read_urb); + retval = usb_submit_urb(port->read_urb, GFP_KERNEL); if (retval) { err("usb_submit_urb(read bulk) failed"); goto exit; } port->interrupt_in_urb->dev = port->serial->dev; - retval = usb_submit_urb(port->interrupt_in_urb); + retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (retval) err(" usb_submit_urb(read int) failed"); } diff -Nru a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c --- a/drivers/usb/serial/cyberjack.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/cyberjack.c Wed Feb 6 20:48:24 2002 @@ -173,7 +173,7 @@ usb_unlink_urb (port->interrupt_in_urb); port->interrupt_in_urb->dev = port->serial->dev; - result = usb_submit_urb(port->interrupt_in_urb); + result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (result) err(" usb_submit_urb(read int) failed"); dbg(__FUNCTION__ " - usb_submit_urb(int urb)"); @@ -271,7 +271,7 @@ port); /* send the data out the bulk port */ - result = usb_submit_urb(port->write_urb); + result = usb_submit_urb(port->write_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting write urb, error %d", result); /* Throw away data. No better idea what to do with it. */ @@ -342,7 +342,7 @@ if( !old_rdtodo ) { port->read_urb->dev = port->serial->dev; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if( result ) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); dbg(__FUNCTION__ " - usb_submit_urb(read urb)"); @@ -398,7 +398,7 @@ /* Continue to read if we have still urbs to do. */ if( priv->rdtodo /* || (urb->actual_length==port->bulk_in_endpointAddress)*/ ) { port->read_urb->dev = port->serial->dev; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); dbg(__FUNCTION__ " - usb_submit_urb(read urb)"); @@ -453,7 +453,7 @@ port); /* send the data out the bulk port */ - result = usb_submit_urb(port->write_urb); + result = usb_submit_urb(port->write_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting write urb, error %d", result); /* Throw away data. No better idea what to do with it. */ diff -Nru a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c --- a/drivers/usb/serial/digi_acceleport.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/digi_acceleport.c Wed Feb 6 20:48:24 2002 @@ -676,7 +676,7 @@ oob_port->write_urb->transfer_buffer_length = len; oob_port->write_urb->dev = port->serial->dev; - if( (ret=usb_submit_urb(oob_port->write_urb)) == 0 ) { + if( (ret=usb_submit_urb(oob_port->write_urb, GFP_KERNEL)) == 0 ) { oob_priv->dp_write_urb_in_use = 1; count -= len; buf += len; @@ -764,7 +764,7 @@ } port->write_urb->dev = port->serial->dev; - if( (ret=usb_submit_urb(port->write_urb)) == 0 ) { + if( (ret=usb_submit_urb(port->write_urb, GFP_KERNEL)) == 0 ) { priv->dp_write_urb_in_use = 1; priv->dp_out_buf_len = 0; count -= len; @@ -841,7 +841,7 @@ oob_port->write_urb->transfer_buffer_length = 8; oob_port->write_urb->dev = port->serial->dev; - if( (ret=usb_submit_urb(oob_port->write_urb)) == 0 ) { + if( (ret=usb_submit_urb(oob_port->write_urb, GFP_KERNEL)) == 0 ) { oob_priv->dp_write_urb_in_use = 1; port_priv->dp_modem_signals = (port_priv->dp_modem_signals&~(TIOCM_DTR|TIOCM_RTS)) @@ -962,7 +962,7 @@ /* restart read chain */ if( priv->dp_throttle_restart ) { port->read_urb->dev = port->serial->dev; - ret = usb_submit_urb( port->read_urb ); + ret = usb_submit_urb( port->read_urb, GFP_KERNEL ); } /* turn throttle off */ @@ -1323,7 +1323,7 @@ /* copy in new data */ memcpy( data, from_user ? user_buf : buf, new_len ); - if( (ret=usb_submit_urb(port->write_urb)) == 0 ) { + if( (ret=usb_submit_urb(port->write_urb, GFP_KERNEL)) == 0 ) { priv->dp_write_urb_in_use = 1; ret = new_len; priv->dp_out_buf_len = 0; @@ -1399,7 +1399,7 @@ memcpy( port->write_urb->transfer_buffer+2, priv->dp_out_buf, priv->dp_out_buf_len ); - if( (ret=usb_submit_urb(port->write_urb)) == 0 ) { + if( (ret=usb_submit_urb(port->write_urb, GFP_KERNEL)) == 0 ) { priv->dp_write_urb_in_use = 1; priv->dp_out_buf_len = 0; } @@ -1677,7 +1677,7 @@ port->write_urb->dev = port->serial->dev; - if( (ret=usb_submit_urb(port->read_urb)) != 0 ) { + if( (ret=usb_submit_urb(port->read_urb, GFP_KERNEL)) != 0 ) { err( __FUNCTION__ ": usb_submit_urb failed, ret=%d, port=%d", ret, i ); @@ -1837,7 +1837,7 @@ /* continue read */ urb->dev = port->serial->dev; - if( (ret=usb_submit_urb(urb)) != 0 ) { + if( (ret=usb_submit_urb(urb, GFP_KERNEL)) != 0 ) { err( __FUNCTION__ ": failed resubmitting urb, ret=%d, port=%d", ret, priv->dp_port_num ); } diff -Nru a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c --- a/drivers/usb/serial/empeg.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/empeg.c Wed Feb 6 20:48:24 2002 @@ -182,7 +182,7 @@ port->read_urb->transfer_flags |= USB_QUEUE_BULK; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); @@ -296,7 +296,7 @@ urb->transfer_flags |= USB_QUEUE_BULK; /* send it down the pipe */ - status = usb_submit_urb(urb); + status = usb_submit_urb(urb, GFP_KERNEL); if (status) { err(__FUNCTION__ " - usb_submit_urb(write bulk) failed with status = %d", status); bytes_sent = status; @@ -449,7 +449,7 @@ port->read_urb->transfer_flags |= USB_QUEUE_BULK; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); @@ -484,7 +484,7 @@ port->read_urb->dev = port->serial->dev; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c --- a/drivers/usb/serial/ftdi_sio.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/ftdi_sio.c Wed Feb 6 20:48:24 2002 @@ -356,7 +356,7 @@ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, ftdi_sio_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); } @@ -479,7 +479,7 @@ port->write_urb->transfer_buffer, count, ftdi_sio_write_bulk_callback, port); - result = usb_submit_urb(port->write_urb); + result = usb_submit_urb(port->write_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting write urb, error %d", result); up (&port->sem); @@ -644,7 +644,7 @@ port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, ftdi_sio_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c --- a/drivers/usb/serial/io_edgeport.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/io_edgeport.c Wed Feb 6 20:48:24 2002 @@ -787,7 +787,7 @@ /* we have pending bytes on the bulk in pipe, send a request */ edge_serial->read_urb->dev = edge_serial->serial->dev; - result = usb_submit_urb(edge_serial->read_urb); + result = usb_submit_urb(edge_serial->read_urb, GFP_KERNEL); if (result) { dbg(__FUNCTION__" - usb_submit_urb(read bulk) failed with result = %d", result); } @@ -864,7 +864,7 @@ /* there is, so resubmit our urb */ edge_serial->read_urb->dev = edge_serial->serial->dev; - status = usb_submit_urb(edge_serial->read_urb); + status = usb_submit_urb(edge_serial->read_urb, GFP_KERNEL); if (status) { err(__FUNCTION__" - usb_submit_urb(read bulk) failed, status = %d", status); } @@ -1031,7 +1031,7 @@ /* start interrupt read for this edgeport * this interrupt will continue as long as the edgeport is connected */ - response = usb_submit_urb (edge_serial->interrupt_read_urb); + response = usb_submit_urb (edge_serial->interrupt_read_urb, GFP_KERNEL); if (response) { err(__FUNCTION__" - Error %d submitting control urb", response); } @@ -1471,7 +1471,7 @@ urb->transfer_flags |= USB_QUEUE_BULK; urb->dev = edge_serial->serial->dev; - status = usb_submit_urb(urb); + status = usb_submit_urb(urb, GFP_KERNEL); if (status) { /* something went wrong */ dbg(__FUNCTION__" - usb_submit_urb(write bulk) failed"); @@ -2477,7 +2477,7 @@ urb->transfer_flags |= USB_QUEUE_BULK; edge_port->commandPending = TRUE; - status = usb_submit_urb(urb); + status = usb_submit_urb(urb, GFP_KERNEL); if (status) { /* something went wrong */ diff -Nru a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c --- a/drivers/usb/serial/ipaq.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/ipaq.c Wed Feb 6 20:48:24 2002 @@ -171,7 +171,7 @@ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, ipaq_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting read urb, error %d", result); } @@ -288,7 +288,7 @@ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, ipaq_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); return; @@ -403,7 +403,7 @@ usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress), port->write_urb->transfer_buffer, count, ipaq_write_bulk_callback, port); - result = usb_submit_urb(urb); + result = usb_submit_urb(urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting write urb, error %d", result); } diff -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c --- a/drivers/usb/serial/ir-usb.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/ir-usb.c Wed Feb 6 20:48:24 2002 @@ -289,7 +289,7 @@ ir_read_bulk_callback, port); port->read_urb->transfer_flags = USB_QUEUE_BULK; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err("%s - failed submitting read urb, error %d", __FUNCTION__, result); } @@ -382,7 +382,7 @@ = USB_QUEUE_BULK | USB_ZERO_PACKET; - result = usb_submit_urb (port->write_urb); + result = usb_submit_urb (port->write_urb, GFP_KERNEL); if (result) err("%s - failed submitting write urb, error %d", __FUNCTION__, result); else @@ -492,7 +492,7 @@ port->read_urb->transfer_flags = USB_QUEUE_BULK; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err("%s - failed resubmitting read urb, error %d", @@ -591,7 +591,7 @@ = USB_QUEUE_BULK | USB_ZERO_PACKET; - result = usb_submit_urb (port->write_urb); + result = usb_submit_urb (port->write_urb, GFP_KERNEL); if (result) err("%s - failed submitting write urb, error %d", __FUNCTION__, result); } diff -Nru a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c --- a/drivers/usb/serial/keyspan.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/keyspan.c Wed Feb 6 20:48:24 2002 @@ -378,7 +378,7 @@ this_urb->transfer_flags &= ~USB_ASYNC_UNLINK; this_urb->dev = port->serial->dev; - if ((err = usb_submit_urb(this_urb)) != 0) { + if ((err = usb_submit_urb(this_urb, GFP_KERNEL)) != 0) { dbg("usb_submit_urb(write bulk) failed (%d)\n", err); } p_priv->tx_start_time[flip] = jiffies; @@ -436,7 +436,7 @@ /* Resubmit urb so we continue receiving */ urb->dev = port->serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err); } return; @@ -535,7 +535,7 @@ exit: /* Resubmit urb so we continue receiving */ urb->dev = serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err); } } @@ -586,7 +586,7 @@ /* Resubmit urb so we continue receiving */ urb->dev = port->serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err); } @@ -671,7 +671,7 @@ exit: /* Resubmit urb so we continue receiving */ urb->dev = serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err); } } @@ -764,7 +764,7 @@ /* Resubmit urb so we continue receiving */ urb->dev = serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err); } } @@ -819,7 +819,7 @@ /* Resubmit urb so we continue receiving */ urb->dev = port->serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err); } } @@ -880,7 +880,7 @@ if ((urb = p_priv->in_urbs[i]) == NULL) continue; urb->dev = serial->dev; - if ((err = usb_submit_urb(urb)) != 0) { + if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ " submit urb %d failed (%d)\n", i, err); } } @@ -1408,7 +1408,7 @@ this_urb->transfer_buffer_length = sizeof(msg); this_urb->dev = serial->dev; - if ((err = usb_submit_urb(this_urb)) != 0) { + if ((err = usb_submit_urb(this_urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ " usb_submit_urb(setup) failed (%d)\n", err); } #if 0 @@ -1494,7 +1494,7 @@ this_urb->transfer_buffer_length = sizeof(msg); this_urb->dev = serial->dev; - if ((err = usb_submit_urb(this_urb)) != 0) { + if ((err = usb_submit_urb(this_urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ " usb_submit_urb(setup) failed\n"); } #if 0 @@ -1622,7 +1622,7 @@ this_urb->transfer_buffer_length = sizeof(msg); this_urb->dev = serial->dev; - if ((err = usb_submit_urb(this_urb)) != 0) { + if ((err = usb_submit_urb(this_urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ " usb_submit_urb(setup) failed (%d)\n", err); } #if 0 @@ -1708,7 +1708,7 @@ keyspan_setup_urbs(serial); s_priv->instat_urb->dev = serial->dev; - if ((err = usb_submit_urb(s_priv->instat_urb)) != 0) { + if ((err = usb_submit_urb(s_priv->instat_urb, GFP_KERNEL)) != 0) { dbg(__FUNCTION__ " submit instat urb failed %d\n", err); } diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c --- a/drivers/usb/serial/keyspan_pda.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/keyspan_pda.c Wed Feb 6 20:48:24 2002 @@ -292,7 +292,7 @@ /* just restart the receive interrupt URB */ dbg("keyspan_pda_rx_unthrottle port %d", port->number); port->interrupt_in_urb->dev = port->serial->dev; - if (usb_submit_urb(port->interrupt_in_urb)) + if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL)) dbg(" usb_submit_urb(read urb) failed"); return; } @@ -584,7 +584,7 @@ priv->tx_room -= count; port->write_urb->dev = port->serial->dev; - rc = usb_submit_urb(port->write_urb); + rc = usb_submit_urb(port->write_urb, GFP_KERNEL); if (rc) { dbg(" usb_submit_urb(write bulk) failed"); goto exit; @@ -699,7 +699,7 @@ /*Start reading from the device*/ port->interrupt_in_urb->dev = serial->dev; - rc = usb_submit_urb(port->interrupt_in_urb); + rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (rc) { dbg(__FUNCTION__" - usb_submit_urb(read int) failed"); goto error; diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c --- a/drivers/usb/serial/kl5kusb105.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/kl5kusb105.c Wed Feb 6 20:48:24 2002 @@ -404,7 +404,7 @@ port); port->read_urb->transfer_flags |= USB_QUEUE_BULK; - rc = usb_submit_urb(port->read_urb); + rc = usb_submit_urb(port->read_urb, GFP_KERNEL); if (rc) { err(__FUNCTION__ " - failed submitting read urb, error %d", rc); @@ -567,7 +567,7 @@ /* send the data out the bulk port */ - result = usb_submit_urb(urb); + result = usb_submit_urb(urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting write urb, error %d", result); @@ -734,7 +734,7 @@ port->read_urb->transfer_buffer_length, klsi_105_read_bulk_callback, port); - rc = usb_submit_urb(port->read_urb); + rc = usb_submit_urb(port->read_urb, GFP_KERNEL); if (rc) err(__FUNCTION__ " - failed resubmitting read urb, error %d", rc); @@ -1041,7 +1041,7 @@ down (&port->sem); port->read_urb->dev = port->serial->dev; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c --- a/drivers/usb/serial/mct_u232.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/mct_u232.c Wed Feb 6 20:48:24 2002 @@ -384,14 +384,14 @@ } port->read_urb->dev = port->serial->dev; - retval = usb_submit_urb(port->read_urb); + retval = usb_submit_urb(port->read_urb, GFP_KERNEL); if (retval) { err("usb_submit_urb(read bulk) failed"); goto exit; } port->interrupt_in_urb->dev = port->serial->dev; - retval = usb_submit_urb(port->interrupt_in_urb); + retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (retval) err(" usb_submit_urb(read int) failed"); @@ -482,7 +482,7 @@ port); /* send the data out the bulk port */ - result = usb_submit_urb(port->write_urb); + result = usb_submit_urb(port->write_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting write urb, error %d", result); diff -Nru a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c --- a/drivers/usb/serial/omninet.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/omninet.c Wed Feb 6 20:48:24 2002 @@ -179,7 +179,7 @@ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, omninet_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); } @@ -274,7 +274,7 @@ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), urb->transfer_buffer, urb->transfer_buffer_length, omninet_read_bulk_callback, port); - result = usb_submit_urb(urb); + result = usb_submit_urb(urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); @@ -325,7 +325,7 @@ wport->write_urb->transfer_buffer_length = 64; wport->write_urb->dev = serial->dev; - result = usb_submit_urb(wport->write_urb); + result = usb_submit_urb(wport->write_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting write urb, error %d", result); else diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c --- a/drivers/usb/serial/pl2303.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/pl2303.c Wed Feb 6 20:48:24 2002 @@ -195,7 +195,7 @@ port->write_urb->transfer_buffer_length = count; port->write_urb->dev = port->serial->dev; - result = usb_submit_urb (port->write_urb); + result = usb_submit_urb (port->write_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting write urb, error %d", result); else @@ -404,7 +404,7 @@ dbg (__FUNCTION__ " - submitting read urb"); port->read_urb->dev = serial->dev; - result = usb_submit_urb (port->read_urb); + result = usb_submit_urb (port->read_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting read urb, error %d", result); up (&port->sem); @@ -414,7 +414,7 @@ dbg (__FUNCTION__ " - submitting interrupt urb"); port->interrupt_in_urb->dev = serial->dev; - result = usb_submit_urb (port->interrupt_in_urb); + result = usb_submit_urb (port->interrupt_in_urb, GFP_KERNEL); if (result) { err(__FUNCTION__ " - failed submitting interrupt urb, error %d", result); up (&port->sem); @@ -652,7 +652,7 @@ dbg (__FUNCTION__ " - caught -EPROTO, resubmitting the urb"); urb->status = 0; urb->dev = serial->dev; - result = usb_submit_urb(urb); + result = usb_submit_urb(urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); return; @@ -677,7 +677,7 @@ /* Schedule the next read _if_ we are still open */ if (port->open_count) { urb->dev = serial->dev; - result = usb_submit_urb(urb); + result = usb_submit_urb(urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); } @@ -706,7 +706,7 @@ dbg (__FUNCTION__ " - nonzero write bulk status received: %d", urb->status); port->write_urb->transfer_buffer_length = 1; port->write_urb->dev = port->serial->dev; - result = usb_submit_urb (port->write_urb); + result = usb_submit_urb (port->write_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting write urb, error %d", result); diff -Nru a/drivers/usb/serial/usbserial.c b/drivers/usb/serial/usbserial.c --- a/drivers/usb/serial/usbserial.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/usbserial.c Wed Feb 6 20:48:24 2002 @@ -813,7 +813,7 @@ serial->type->read_bulk_callback : generic_read_bulk_callback), port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); } @@ -894,7 +894,7 @@ generic_write_bulk_callback), port); /* send the data out the bulk port */ - result = usb_submit_urb(port->write_urb); + result = usb_submit_urb(port->write_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting write urb, error %d", result); else @@ -987,7 +987,7 @@ ((serial->type->read_bulk_callback) ? serial->type->read_bulk_callback : generic_read_bulk_callback), port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); } diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c --- a/drivers/usb/serial/visor.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/visor.c Wed Feb 6 20:48:24 2002 @@ -274,7 +274,7 @@ port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, visor_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); } @@ -388,7 +388,7 @@ urb->transfer_flags |= USB_QUEUE_BULK; /* send it down the pipe */ - status = usb_submit_urb(urb); + status = usb_submit_urb(urb, GFP_KERNEL); if (status) { err(__FUNCTION__ " - usb_submit_urb(write bulk) failed with status = %d", status); bytes_sent = status; @@ -520,7 +520,7 @@ port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, visor_read_bulk_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed resubmitting read urb, error %d", result); return; @@ -551,7 +551,7 @@ down (&port->sem); port->read_urb->dev = port->serial->dev; - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) err(__FUNCTION__ " - failed submitting read urb, error %d", result); diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c --- a/drivers/usb/serial/whiteheat.c Wed Feb 6 20:48:24 2002 +++ b/drivers/usb/serial/whiteheat.c Wed Feb 6 20:48:24 2002 @@ -240,7 +240,7 @@ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, command_port_read_callback, port); - result = usb_submit_urb(port->read_urb); + result = usb_submit_urb(port->read_urb, GFP_KERNEL); if (result) dbg(__FUNCTION__ " - failed resubmitting read urb, error %d", result); } @@ -265,7 +265,7 @@ memcpy (&transfer_buffer[1], data, datasize); port->write_urb->transfer_buffer_length = datasize + 1; port->write_urb->dev = serial->dev; - retval = usb_submit_urb (port->write_urb); + retval = usb_submit_urb (port->write_urb, GFP_KERNEL); if (retval) { dbg (__FUNCTION__" - submit urb failed"); goto exit; @@ -327,7 +327,7 @@ command_port->read_urb->complete = command_port_read_callback; command_port->read_urb->dev = port->serial->dev; command_port->tty = port->tty; /* need this to "fake" our our sanity check macros */ - retval = usb_submit_urb (command_port->read_urb); + retval = usb_submit_urb (command_port->read_urb, GFP_KERNEL); if (retval) { err(__FUNCTION__ " - failed submitting read urb, error %d", retval); goto error_exit; @@ -336,7 +336,7 @@ /* Start reading from the device */ port->read_urb->dev = port->serial->dev; - retval = usb_submit_urb(port->read_urb); + retval = usb_submit_urb(port->read_urb, GFP_KERNEL); if (retval) { err(__FUNCTION__ " - failed submitting read urb, error %d", retval); goto error_exit;