From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 27 Sep 2012 05:29:59 +0000 (+1000)
Subject: Merge remote-tracking branch 'char-misc/char-misc-next'
X-Git-Tag: next-20120927~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9f7edda7a34ba99ee3e4bf82710255320932fed1;p=karo-tx-linux.git

Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
	drivers/char/pcmcia/synclink_cs.c
---

9f7edda7a34ba99ee3e4bf82710255320932fed1
diff --cc drivers/char/pcmcia/synclink_cs.c
index 3f57d5de3957,a6b8ddea2227..21721d25e388
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@@ -1050,7 -1058,7 +1058,7 @@@ static void cts_change(MGSLPC_INFO *inf
  	wake_up_interruptible(&info->status_event_wait_q);
  	wake_up_interruptible(&info->event_wait_q);
  
- 	if (tty_port_cts_enabled(&info->port)) {
 -	if (tty && (info->port.flags & ASYNC_CTS_FLOW)) {
++	if (tty && tty_port_cts_enabled(&info->port)) {
  		if (tty->hw_stopped) {
  			if (info->serial_signals & SerialSignal_CTS) {
  				if (debug_level >= DEBUG_LEVEL_ISR)