summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2021-03-11 14:37:14 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-07 12:48:51 +0200
commit1e63430a1fe941e537e4dba96944326576dd4f4d (patch)
treef66763b9e9460ec0cb5cd1da59510d2d135f9c47
parentd8ae07e00afc91f8f94730e2916a9251e7c03c62 (diff)
downloadlinux-stable-1e63430a1fe941e537e4dba96944326576dd4f4d.tar.gz
linux-stable-1e63430a1fe941e537e4dba96944326576dd4f4d.tar.bz2
linux-stable-1e63430a1fe941e537e4dba96944326576dd4f4d.zip
cdc-acm: fix BREAK rx code path adding necessary calls
commit 08dff274edda54310d6f1cf27b62fddf0f8d146e upstream. Counting break events is nice but we should actually report them to the tty layer. Fixes: 5a6a62bdb9257 ("cdc-acm: add TIOCMIWAIT") Signed-off-by: Oliver Neukum <oneukum@suse.com> Link: https://lore.kernel.org/r/20210311133714.31881-1-oneukum@suse.com Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/cdc-acm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index c523dfe408d5..7a38d2899cc3 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -312,8 +312,10 @@ static void acm_process_notification(struct acm *acm, unsigned char *buf)
acm->iocount.dsr++;
if (difference & ACM_CTRL_DCD)
acm->iocount.dcd++;
- if (newctrl & ACM_CTRL_BRK)
+ if (newctrl & ACM_CTRL_BRK) {
acm->iocount.brk++;
+ tty_insert_flip_char(&acm->port, 0, TTY_BREAK);
+ }
if (newctrl & ACM_CTRL_RI)
acm->iocount.rng++;
if (newctrl & ACM_CTRL_FRAMING)