Merge tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver patches from Greg KH:
 "Here's the big tty/serial driver update for 3.20-rc1.  Nothing huge
  here, just lots of driver updates and some core tty layer fixes as
  well.  All have been in linux-next with no reported issues"

* tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  serial: 8250: Fix UART_BUG_TXEN workaround
  serial: driver for ETRAX FS UART
  tty: remove unused variable sprop
  serial: of-serial: fetch line number from DT
  serial: samsung: earlycon support depends on CONFIG_SERIAL_SAMSUNG_CONSOLE
  tty/serial: serial8250_set_divisor() can be static
  tty/serial: Add Spreadtrum sc9836-uart driver support
  Documentation: DT: Add bindings for Spreadtrum SoC Platform
  serial: samsung: remove redundant interrupt enabling
  tty: Remove external interface for tty_set_termios()
  serial: omap: Fix RTS handling
  serial: 8250_omap: Use UPSTAT_AUTORTS for RTS handling
  serial: core: Rework hw-assisted flow control support
  tty/serial: 8250_early: Add support for PXA UARTs
  tty/serial: of_serial: add support for PXA/MMP uarts
  tty/serial: of_serial: add DT alias ID handling
  serial: 8250: Prevent concurrent updates to shadow registers
  serial: 8250: Use canary to restart console after suspend
  serial: 8250: Refactor XR17V35X divisor calculation
  serial: 8250: Refactor divisor programming
  ...

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index 2ff6dfd2d3f0..9c4dcf4c62ea 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -51,33 +51,22 @@ struct ath_struct {
 
 static int ath_wakeup_ar3k(struct tty_struct *tty)
 {
-        struct ktermios ktermios;
         int status = tty->driver->ops->tiocmget(tty);
 
         if (status & TIOCM_CTS)
                 return status;
 
-        /* Disable Automatic RTSCTS */
-        ktermios = tty->termios;
-        ktermios.c_cflag &= ~CRTSCTS;
-        tty_set_termios(tty, &ktermios);
-
         /* Clear RTS first */
-        status = tty->driver->ops->tiocmget(tty);
+        tty->driver->ops->tiocmget(tty);
         tty->driver->ops->tiocmset(tty, 0x00, TIOCM_RTS);
         mdelay(20);
 
         /* Set RTS, wake up board */
-        status = tty->driver->ops->tiocmget(tty);
+        tty->driver->ops->tiocmget(tty);
         tty->driver->ops->tiocmset(tty, TIOCM_RTS, 0x00);
         mdelay(20);
 
         status = tty->driver->ops->tiocmget(tty);
-
-        /* Enable Automatic RTSCTS */
-        ktermios.c_cflag |= CRTSCTS;
-        status = tty_set_termios(tty, &ktermios);
-
         return status;
 }