patch-2.4.0-test10 linux/drivers/usb/serial/keyspan_pda.c

Next file: linux/drivers/usb/serial/omninet.c
Previous file: linux/drivers/usb/serial/keyspan.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/usb/serial/keyspan_pda.c linux/drivers/usb/serial/keyspan_pda.c
@@ -12,6 +12,10 @@
  *
  * See Documentation/usb/usb-serial.txt for more information on using this driver
  * 
+ * (10/05/2000) gkh
+ *	Fixed bug with urb->dev not being set properly, now that the usb
+ *	core needs it.
+ * 
  * (08/28/2000) gkh
  *	Added locks for SMP safeness.
  *	Fixed MOD_INC and MOD_DEC logic and the ability to open a port more 
@@ -212,6 +216,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))
 		dbg(" usb_submit_urb(read urb) failed");
 	return;
@@ -506,6 +511,7 @@
 		
 		priv->tx_room -= count;
 
+		port->write_urb->dev = port->serial->dev;
 		if (usb_submit_urb(port->write_urb)) {
 			dbg(" usb_submit_urb(write bulk) failed");
 			spin_unlock_irqrestore (&port->port_lock, flags);
@@ -627,6 +633,7 @@
 			keyspan_pda_set_modem_info(serial, 0);
 
 		/*Start reading from the device*/
+		port->interrupt_in_urb->dev = serial->dev;
 		if (usb_submit_urb(port->interrupt_in_urb))
 			dbg(__FUNCTION__" - usb_submit_urb(read int) failed");
 	} else {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)