Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index 6a160c17ea94..bd34406faaae 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -51,32 +51,32 @@ struct ath_struct {
 
 static int ath_wakeup_ar3k(struct tty_struct *tty)
 {
-        struct termios settings;
-        int status = tty->driver->ops->tiocmget(tty, NULL);
+        struct ktermios ktermios;
+        int status = tty->driver->ops->tiocmget(tty);
 
         if (status & TIOCM_CTS)
                 return status;
 
         /* Disable Automatic RTSCTS */
-        n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings);
-        settings.c_cflag &= ~CRTSCTS;
-        n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings);
+        memcpy(&ktermios, tty->termios, sizeof(ktermios));
+        ktermios.c_cflag &= ~CRTSCTS;
+        tty_set_termios(tty, &ktermios);
 
         /* Clear RTS first */
-        status = tty->driver->ops->tiocmget(tty, NULL);
-        tty->driver->ops->tiocmset(tty, NULL, 0x00, TIOCM_RTS);
+        status = 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, NULL);
-        tty->driver->ops->tiocmset(tty, NULL, TIOCM_RTS, 0x00);
+        status = tty->driver->ops->tiocmget(tty);
+        tty->driver->ops->tiocmset(tty, TIOCM_RTS, 0x00);
         mdelay(20);
 
-        status = tty->driver->ops->tiocmget(tty, NULL);
+        status = tty->driver->ops->tiocmget(tty);
 
-        n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings);
-        settings.c_cflag |= CRTSCTS;
-        n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings);
+        /* Disable Automatic RTSCTS */
+        ktermios.c_cflag |= CRTSCTS;
+        status = tty_set_termios(tty, &ktermios);
 
         return status;
 }