hci_ath: Fix the mess in this driver

Was this exploitable - who knows, but it was certainly totally broken

Signed-of-by: Alan Cox <alan@linux.intel.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-02-14 16:28:18 +00:00 committed by Greg Kroah-Hartman
parent 8d075b199b
commit afaae08442

View File

@ -51,32 +51,32 @@ struct ath_struct {
static int ath_wakeup_ar3k(struct tty_struct *tty) static int ath_wakeup_ar3k(struct tty_struct *tty)
{ {
struct termios settings; struct ktermios ktermios;
int status = tty->driver->ops->tiocmget(tty, NULL); int status = tty->driver->ops->tiocmget(tty);
if (status & TIOCM_CTS) if (status & TIOCM_CTS)
return status; return status;
/* Disable Automatic RTSCTS */ /* Disable Automatic RTSCTS */
n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings); memcpy(&ktermios, tty->termios, sizeof(ktermios));
settings.c_cflag &= ~CRTSCTS; ktermios.c_cflag &= ~CRTSCTS;
n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings); tty_set_termios(tty, &ktermios);
/* Clear RTS first */ /* Clear RTS first */
status = tty->driver->ops->tiocmget(tty, NULL); status = tty->driver->ops->tiocmget(tty);
tty->driver->ops->tiocmset(tty, NULL, 0x00, TIOCM_RTS); tty->driver->ops->tiocmset(tty, 0x00, TIOCM_RTS);
mdelay(20); mdelay(20);
/* Set RTS, wake up board */ /* Set RTS, wake up board */
status = tty->driver->ops->tiocmget(tty, NULL); status = tty->driver->ops->tiocmget(tty);
tty->driver->ops->tiocmset(tty, NULL, TIOCM_RTS, 0x00); tty->driver->ops->tiocmset(tty, TIOCM_RTS, 0x00);
mdelay(20); 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); /* Disable Automatic RTSCTS */
settings.c_cflag |= CRTSCTS; ktermios.c_cflag |= CRTSCTS;
n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings); status = tty_set_termios(tty, &ktermios);
return status; return status;
} }