Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3e152505a57db6622deb1322c22551c046e33d16
Commit:     3e152505a57db6622deb1322c22551c046e33d16
Parent:     eb44da0b3aa0105cb38d81c5747a8feae64834be
Author:     Sarah Sharp <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 14 14:08:35 2007 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 14:34:55 2008 -0800

    USB: pl2303: Move pl2303 vendor specific init to probe function.
    
    Without this fix, the pl2303 usb-serial adapter would not suspend properly
    unless it had been opened first.  A pl2303 type_1 chip will still break if 
the
    system is hibernated while the RS-232 connector is powered by another 
system.
    This was broken before, and a reset resume does not fix it.  All other 
suspend
    and autosuspend scenarios work with ATEN pl2303 adaptors with HX and type_1 
chips.
    
    Signed-off-by: Sarah Sharp <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/pl2303.c |   49 +++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index fd8c09f..c27f2f8 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -338,8 +338,13 @@ static int pl2303_startup(struct usb_serial *serial)
 {
        struct pl2303_private *priv;
        enum pl2303_type type = type_0;
+       unsigned char *buf;
        int i;
 
+       buf = kmalloc(10, GFP_KERNEL);
+       if (buf == NULL)
+               return -ENOMEM;
+
        if (serial->dev->descriptor.bDeviceClass == 0x02)
                type = type_0;
        else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40)
@@ -364,9 +369,27 @@ static int pl2303_startup(struct usb_serial *serial)
                priv->type = type;
                usb_set_serial_port_data(serial->port[i], priv);
        }
+
+       pl2303_vendor_read(0x8484, 0, serial, buf);
+       pl2303_vendor_write(0x0404, 0, serial);
+       pl2303_vendor_read(0x8484, 0, serial, buf);
+       pl2303_vendor_read(0x8383, 0, serial, buf);
+       pl2303_vendor_read(0x8484, 0, serial, buf);
+       pl2303_vendor_write(0x0404, 1, serial);
+       pl2303_vendor_read(0x8484, 0, serial, buf);
+       pl2303_vendor_read(0x8383, 0, serial, buf);
+       pl2303_vendor_write(0, 1, serial);
+       pl2303_vendor_write(1, 0, serial);
+       if (type == HX)
+               pl2303_vendor_write(2, 0x44, serial);
+       else
+               pl2303_vendor_write(2, 0x24, serial);
+
+       kfree(buf);
        return 0;
 
 cleanup:
+       kfree(buf);
        for (--i; i>=0; --i) {
                priv = usb_get_serial_port_data(serial->port[i]);
                pl2303_buf_free(priv->buf);
@@ -690,7 +713,6 @@ static int pl2303_open(struct usb_serial_port *port, struct 
file *filp)
        struct ktermios tmp_termios;
        struct usb_serial *serial = port->serial;
        struct pl2303_private *priv = usb_get_serial_port_data(port);
-       unsigned char *buf;
        int result;
 
        dbg("%s -  port %d", __FUNCTION__, port->number);
@@ -698,35 +720,12 @@ static int pl2303_open(struct usb_serial_port *port, 
struct file *filp)
        if (priv->type != HX) {
                usb_clear_halt(serial->dev, port->write_urb->pipe);
                usb_clear_halt(serial->dev, port->read_urb->pipe);
-       }
-
-       buf = kmalloc(10, GFP_KERNEL);
-       if (buf==NULL)
-               return -ENOMEM;
-
-       pl2303_vendor_read(0x8484, 0, serial, buf);
-       pl2303_vendor_write(0x0404, 0, serial);
-       pl2303_vendor_read(0x8484, 0, serial, buf);
-       pl2303_vendor_read(0x8383, 0, serial, buf);
-       pl2303_vendor_read(0x8484, 0, serial, buf);
-       pl2303_vendor_write(0x0404, 1, serial);
-       pl2303_vendor_read(0x8484, 0, serial, buf);
-       pl2303_vendor_read(0x8383, 0, serial, buf);
-       pl2303_vendor_write(0, 1, serial);
-       pl2303_vendor_write(1, 0, serial);
-
-       if (priv->type == HX) {
-               /* HX chip */
-               pl2303_vendor_write(2, 0x44, serial);
+       } else {
                /* reset upstream data pipes */
                pl2303_vendor_write(8, 0, serial);
                pl2303_vendor_write(9, 0, serial);
-       } else {
-               pl2303_vendor_write(2, 0x24, serial);
        }
 
-       kfree(buf);
-
        /* Setup termios */
        if (port->tty) {
                pl2303_set_termios(port, &tmp_termios);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to