浏览代码

USB: visor: fix initialisation of UX50/TH55 devices

Fix regression introduced by commit
214916f2ec6701e1c9972f26c60b3dc37d3153c6 (USB: visor: reimplement using
generic framework) which broke initialisation of UX50/TH55 devices that
used re-mapped bulk-out endpoint addresses.

Reported-by: Robert Gadsdon <rgadsdon@bayarea.net>
Tested-by: Robert Gadsdon <rgadsdon@bayarea.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Johan Hovold 14 年之前
父节点
当前提交
cfb8da8f69
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10 1
      drivers/usb/serial/visor.c

+ 10 - 1
drivers/usb/serial/visor.c

@@ -606,6 +606,10 @@ static int treo_attach(struct usb_serial *serial)
 
 
 static int clie_5_attach(struct usb_serial *serial)
 static int clie_5_attach(struct usb_serial *serial)
 {
 {
+	struct usb_serial_port *port;
+	unsigned int pipe;
+	int j;
+
 	dbg("%s", __func__);
 	dbg("%s", __func__);
 
 
 	/* TH55 registers 2 ports.
 	/* TH55 registers 2 ports.
@@ -621,9 +625,14 @@ static int clie_5_attach(struct usb_serial *serial)
 		return -1;
 		return -1;
 
 
 	/* port 0 now uses the modified endpoint Address */
 	/* port 0 now uses the modified endpoint Address */
-	serial->port[0]->bulk_out_endpointAddress =
+	port = serial->port[0];
+	port->bulk_out_endpointAddress =
 				serial->port[1]->bulk_out_endpointAddress;
 				serial->port[1]->bulk_out_endpointAddress;
 
 
+	pipe = usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress);
+	for (j = 0; j < ARRAY_SIZE(port->write_urbs); ++j)
+		port->write_urbs[j]->pipe = pipe;
+
 	return 0;
 	return 0;
 }
 }