Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits)
  USB: fix race in autosuspend reschedule
  atmel_usba_udc: Keep track of the device status
  USB: Nikon D40X unusual_devs entry
  USB: serial core should respect driver requirements
  USB: documentation for USB power management
  USB: skip autosuspended devices during system resume
  USB: mutual exclusion for EHCI init and port resets
  USB: allow usbstorage to have LUNS greater than 2Tb
  USB: Adding support for SHARP WS011SH to ipaq.c
  USB: add atmel_usba_udc driver
  USB: ohci SSB bus glue
  USB: ehci build fixes on au1xxx, ppc-soc
  USB: add runtime frame_no quirk for big-endian OHCI
  USB: funsoft: Fix termios
  USB: visor: termios bits
  USB: unusual_devs entry for Nikon DSC D2Xs
  USB: re-remove <linux/usb_sl811.h>
  USB: move <linux/usb_gadget.h> to <linux/usb/gadget.h>
  USB: Export URB statistics for powertop
  USB: serial gadget: Disable endpoints on unload
  ...

1 files changed, 18 insertions, 10 deletions

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 5a4127e62c4a..90e3216abd1f 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -728,24 +728,32 @@ static void klsi_105_set_termios (struct usb_serial_port *port,
 #endif
                 }
                 
-                switch(cflag & CBAUD) {
-                case B0: /* handled below */
+                switch(tty_get_baud_rate(port->tty)) {
+                case 0: /* handled below */
                         break;
-                case B1200: priv->cfg.baudrate = kl5kusb105a_sio_b1200;
+                case 1200:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b1200;
                         break;
-                case B2400: priv->cfg.baudrate = kl5kusb105a_sio_b2400;
+                case 2400:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b2400;
                         break;
-                case B4800: priv->cfg.baudrate = kl5kusb105a_sio_b4800;
+                case 4800:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b4800;
                         break;
-                case B9600: priv->cfg.baudrate = kl5kusb105a_sio_b9600;
+                case 9600:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b9600;
                         break;
-                case B19200: priv->cfg.baudrate = kl5kusb105a_sio_b19200;
+                case 19200:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b19200;
                         break;
-                case B38400: priv->cfg.baudrate = kl5kusb105a_sio_b38400;
+                case 38400:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b38400;
                         break;
-                case B57600: priv->cfg.baudrate = kl5kusb105a_sio_b57600;
+                case 57600:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b57600;
                         break;
-                case B115200: priv->cfg.baudrate = kl5kusb105a_sio_b115200;
+                case 115200:
+                        priv->cfg.baudrate = kl5kusb105a_sio_b115200;
                         break;
                 default:
                         err("KLSI USB->Serial converter:"