diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-11-18 15:13:26 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-18 15:13:26 -0500 |
| commit | f48ecb19bc0443a4272dd0934e7bee4480610df9 (patch) | |
| tree | eb29c8f7491e0fbf93e0c722a4b3feb575fc93c3 /drivers/bluetooth/hci_ath.c | |
| parent | 47b6308b643302e642ca2a5cb6470926f7e1c428 (diff) | |
| parent | a86c02ea38c53b695209b1181f9e2e18d73eb4e8 (diff) | |
| download | talos-op-linux-f48ecb19bc0443a4272dd0934e7bee4480610df9.tar.gz talos-op-linux-f48ecb19bc0443a4272dd0934e7bee4480610df9.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg <johan.hedberg@gmail.com> says:
"Here's another bluetooth-next pull request for 3.19. We've got:
- Various fixes, cleanups and improvements to ieee802154/mac802154
- Support for a Broadcom BCM20702A1 variant
- Lots of lockdep fixes
- Fixed handling of LE CoC errors that should trigger SMP"
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bluetooth/hci_ath.c')
| -rw-r--r-- | drivers/bluetooth/hci_ath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c index 0bc8a6a6a148..2ff6dfd2d3f0 100644 --- a/drivers/bluetooth/hci_ath.c +++ b/drivers/bluetooth/hci_ath.c @@ -74,7 +74,7 @@ static int ath_wakeup_ar3k(struct tty_struct *tty) status = tty->driver->ops->tiocmget(tty); - /* Disable Automatic RTSCTS */ + /* Enable Automatic RTSCTS */ ktermios.c_cflag |= CRTSCTS; status = tty_set_termios(tty, &ktermios); |
