aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorOliver Neukum <[email protected]>2009-09-08 21:51:28 +0000
committerGreg Kroah-Hartman <[email protected]>2009-09-23 13:46:16 +0000
commit7af25b4b34a2439020d78da765a3bed0ff73f25c (patch)
tree2a4a62760bf8e233f421e0b724a277e6391c5038 /drivers/usb/class/cdc-acm.c
parentUSB: CDC WDM driver doesn't support non-blocking reads (diff)
downloadkernel-7af25b4b34a2439020d78da765a3bed0ff73f25c.tar.gz
kernel-7af25b4b34a2439020d78da765a3bed0ff73f25c.zip
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 <[email protected]> Cc: Marcel Holtmann <[email protected]> Cc: Paul Martin <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 85a1a55815cf..e3861b21e776 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);