Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / serial / visor.c

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index eb76aaef42685ad36ade0fc4e25282e0e361d18d..15a5d89b7f397596e45475afc83b83a8ea1d2ffa 100644 (file)
--- a/drivers/usb/serial/visor.c
+++ b/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)
 {
+       struct usb_serial_port *port;
+       unsigned int pipe;
+       int j;
+
        dbg("%s", __func__);
 
        /* TH55 registers 2 ports.
@@ -621,9 +625,14 @@ static int clie_5_attach(struct usb_serial *serial)
                return -1;
 
        /* 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;
 
+       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;
 }