[gentoo-commits] linux-patches r1615 - genpatches-2.6/trunk/2.6.31

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2009-09-28 15:44:45 +0000 (Mon, 28 Sep 2009)
New Revision: 1615

Added:
   genpatches-2.6/trunk/2.6.31/2300_cdc-acm-set-open-flag.patch
Modified:
   genpatches-2.6/trunk/2.6.31/0000_README
Log:
Patch to fix cdc-acm regression in open

Modified: genpatches-2.6/trunk/2.6.31/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.31/0000_README	2009-09-27 19:18:15 UTC (rev 1614)
+++ genpatches-2.6/trunk/2.6.31/0000_README	2009-09-28 15:44:45 UTC (rev 1615)
@@ -43,6 +43,10 @@
 From:   http://www.kernel.org
 Desc:   Linux 2.6.31.1
 
+Patch:  2300_cdc-acm-set-open-flag.patch
+From:   http://bugs.gentoo.org/show_bug.cgi?id=286761
+Desc:   fix cdc-acm regression in open
+
 Patch:  2900_cc1-option-fPIC-check.patch
 From:   http://bugs.gentoo.org/show_bug.cgi?id=282201
 Desc:   fix cc1 options check to ensure we do not use -fPIC when compiling

Added: genpatches-2.6/trunk/2.6.31/2300_cdc-acm-set-open-flag.patch
===================================================================
--- genpatches-2.6/trunk/2.6.31/2300_cdc-acm-set-open-flag.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.31/2300_cdc-acm-set-open-flag.patch	2009-09-28 15:44:45 UTC (rev 1615)
@@ -0,0 +1,39 @@
+From: Oliver Neukum <oliver@××××××.org>
+Date: Tue, 8 Sep 2009 21:51:28 +0000 (+0200)
+Subject: USB: fix cdc-acm regression in open
+X-Git-Tag: v2.6.32-rc1~174^2~135
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7af25b4b34a2439020d78da765a3bed0ff73f25c
+
+USB: fix cdc-acm regression in open
+
+cdc-acm needs to set a flag during open to tell the
+tty layer that the device is initialized
+
+Signed-off-by: Oliver Neukum <oliver@××××××.org>
+Cc: Marcel Holtmann <marcel@××××××××.org>
+Cc: Paul Martin <pm@××××××.org>
+Cc: stable <stable@××××××.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@××××.de>
+---
+
+diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
+index 85a1a55..e3861b2 100644
+--- a/drivers/usb/class/cdc-acm.c
++++ b/drivers/usb/class/cdc-acm.c
+@@ -59,6 +59,7 @@
+ #include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
++#include <linux/serial.h>
+ #include <linux/tty_driver.h>
+ #include <linux/tty_flip.h>
+ #include <linux/module.h>
+@@ -609,6 +610,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
+ 	acm->throttle = 0;
+ 
+ 	tasklet_schedule(&acm->urb_task);
++	set_bit(ASYNCB_INITIALIZED, &acm->port.flags);
+ 	rv = tty_port_block_til_ready(&acm->port, tty, filp);
+ done:
+ 	mutex_unlock(&acm->mutex);
+