Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[deliverable/linux.git] / drivers / usb / serial / ark3116.c

diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index edd685791a6b1cc030a6c7cdd5464db146dad585..2a8e537cb046eb77a7bcc77a60679d7d716a96cf 100644 (file)
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -63,7 +63,8 @@ static inline void ARK3116_RCV(struct usb_serial *serial, int seq,
                                 request, requesttype, value, index,
                                 buf, 0x0000001, 1000);
        if (result)
-               dbg("%03d < %d bytes [0x%02X]", seq, result, buf[0]);
+               dbg("%03d < %d bytes [0x%02X]", seq, result,
+                   ((unsigned char *)buf)[0]);
        else
                dbg("%03d < 0 bytes", seq);
 }
@@ -171,11 +172,6 @@ static void ark3116_set_termios(struct usb_serial_port *port,
 
        dbg("%s - port %d", __FUNCTION__, port->number);
 
-       if ((!port->tty) || (!port->tty->termios)) {
-               dbg("%s - no tty structures", __FUNCTION__);
-               return;
-       }
-
        spin_lock_irqsave(&priv->lock, flags);
        if (!priv->termios_initialized) {
                *(port->tty->termios) = tty_std_termios;
@@ -187,16 +183,6 @@ static void ark3116_set_termios(struct usb_serial_port *port,
 
        cflag = port->tty->termios->c_cflag;
 
-       /* check that they really want us to change something: */
-       if (old_termios) {
-               if ((cflag == old_termios->c_cflag) &&
-                   (RELEVANT_IFLAG(port->tty->termios->c_iflag) ==
-                    RELEVANT_IFLAG(old_termios->c_iflag))) {
-                       dbg("%s - nothing to change...", __FUNCTION__);
-                       return;
-               }
-       }
-
        buf = kmalloc(1, GFP_KERNEL);
        if (!buf) {
                dbg("error kmalloc");
@@ -219,7 +205,7 @@ static void ark3116_set_termios(struct usb_serial_port *port,
                        dbg("setting CS7");
                        break;
                default:
-                       err("CSIZE was set but not CS5-CS8, using CS8!");
+                       dbg("CSIZE was set but not CS5-CS8, using CS8!");
                        /* fall through */
                case CS8:
                        config |= 0x03;
@@ -250,38 +236,33 @@ static void ark3116_set_termios(struct usb_serial_port *port,
        }
 
        /* set baudrate */
-       baud = 0;
-       switch (cflag & CBAUD) {
-               case B0:
-                       err("can't set 0 baud, using 9600 instead");
+       baud = tty_get_baud_rate(port->tty);
+
+       switch (baud) {
+               case 75:
+               case 150:
+               case 300:
+               case 600:
+               case 1200:
+               case 1800:
+               case 2400:
+               case 4800:
+               case 9600:
+               case 19200:
+               case 38400:
+               case 57600:
+               case 115200:
+               case 230400:
+               case 460800:
                        break;
-               case B75:       baud = 75;      break;
-               case B150:      baud = 150;     break;
-               case B300:      baud = 300;     break;
-               case B600:      baud = 600;     break;
-               case B1200:     baud = 1200;    break;
-               case B1800:     baud = 1800;    break;
-               case B2400:     baud = 2400;    break;
-               case B4800:     baud = 4800;    break;
-               case B9600:     baud = 9600;    break;
-               case B19200:    baud = 19200;   break;
-               case B38400:    baud = 38400;   break;
-               case B57600:    baud = 57600;   break;
-               case B115200:   baud = 115200;  break;
-               case B230400:   baud = 230400;  break;
-               case B460800:   baud = 460800;  break;
+               /* set 9600 as default (if given baudrate is invalid for example) */
                default:
-                       dbg("does not support the baudrate requested (fix it)");
-                       break;
+                       baud = 9600;
        }
 
-       /* set 9600 as default (if given baudrate is invalid for example) */
-       if (baud == 0)
-               baud = 9600;
-
        /*
         * found by try'n'error, be careful, maybe there are other options
-        * for multiplicator etc!
+        * for multiplicator etc! (3.5 for example)
         */
        if (baud == 460800)
                /* strange, for 460800 the formula is wrong
@@ -341,7 +322,7 @@ static int ark3116_open(struct usb_serial_port *port, struct file *filp)
 
        result = usb_serial_generic_open(port, filp);
        if (result)
-               return result;
+               goto err_out;
 
        /* open */
        ARK3116_RCV(serial, 111, 0xFE, 0xC0, 0x0000, 0x0003, 0x02, buf);
@@ -372,6 +353,7 @@ static int ark3116_open(struct usb_serial_port *port, struct file *filp)
        if (port->tty)
                ark3116_set_termios(port, &tmp_termios);
 
+err_out:
        kfree(buf);
 
        return result;