[kernel/f13/master] Revert commit 6a1a82df91fa0eb1cc76069a9efe5714d087eccd from 2.6.34.1

[Chuck Ebbert]

commit 9a3ee122e6829671582403b3f0e3a3537500f42b
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Wed Sep 1 04:54:21 2010 -0400

    Revert commit 6a1a82df91fa0eb1cc76069a9efe5714d087eccd from 2.6.34.1
    
    it breaks ftdi_sio (#613597)

 kernel.spec                      |    6 ++++-
 linux-2.6-upstream-reverts.patch |   49 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 6478f86..2116966 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 47
+%global baserelease 48
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2045,6 +2045,10 @@ fi
 
 
 %changelog
+* Wed Sep 01 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.6-48
+- Revert commit 6a1a82df91fa0eb1cc76069a9efe5714d087eccd from 2.6.34.1;
+  it breaks ftdi_sio (#613597)
+
 * Fri Aug 27 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.6-47
 - Linux 2.6.34.6
 - drivers-hwmon-coretemp-c-detect-the-thermal-sensors-by-cpuid.patch (#625734)
diff --git a/linux-2.6-upstream-reverts.patch b/linux-2.6-upstream-reverts.patch
index 71d57f7..146558a 100644
--- a/linux-2.6-upstream-reverts.patch
+++ b/linux-2.6-upstream-reverts.patch
@@ -1,3 +1,52 @@
+From 6a1a82df91fa0eb1cc76069a9efe5714d087eccd Mon Sep 17 00:00:00 2001
+From: Daniel Mack <daniel at caiaq.de>
+Date: Thu, 3 Jun 2010 13:55:02 +0200
+Subject: USB: ftdi_sio: fix DTR/RTS line modes
+
+From: Daniel Mack <daniel at caiaq.de>
+
+commit 6a1a82df91fa0eb1cc76069a9efe5714d087eccd upstream.
+
+Call set_mctrl() and clear_mctrl() according to the flow control mode
+selected. This makes serial communication for FT232 connected devices
+work when CRTSCTS is not set.
+
+This fixes a regression introduced by 4175f3e31 ("tty_port: If we are
+opened non blocking we still need to raise the carrier"). This patch
+calls the low-level driver's dtr_rts() function which consequently sets
+TIOCM_DTR | TIOCM_RTS. A later call to set_termios() without CRTSCTS in
+cflags, however, does not reset these bits, and so data is not actually
+sent out on the serial wire.
+
+Signed-off-by: Daniel Mack <daniel at caiaq.de>
+Cc: Johan Hovold <jhovold at gmail.com>
+Cc: Alan Cox <alan at linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -2289,6 +2289,8 @@ static void ftdi_set_termios(struct tty_
+ 				"urb failed to set to rts/cts flow control\n");
+ 		}
+ 
++		/* raise DTR/RTS */
++		set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+ 	} else {
+ 		/*
+ 		 * Xon/Xoff code
+@@ -2336,6 +2338,8 @@ static void ftdi_set_termios(struct tty_
+ 			}
+ 		}
+ 
++		/* lower DTR/RTS */
++		clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+ 	}
+ 	return;
+ }
 From 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b Mon Sep 17 00:00:00 2001
 From: Alan Stern <stern at rowland.harvard.edu>
 Date: Fri, 2 Apr 2010 13:21:58 -0400