diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 04:14:55 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 04:14:55 -0400 |
| commit | db8c076b9206ea35b1f7299708d5510b17674db2 (patch) | |
| tree | 7a5ee32db0c25bb29598c7c300ce7f2680f533a9 /drivers/usb/serial/mos7720.c | |
| parent | af6261031317f646d22f994c0b467521e47aa49f (diff) | |
| parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 30922a7e3347..aa665817a272 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
| @@ -2024,6 +2024,9 @@ static int mos7720_ioctl(struct tty_struct *tty, struct file *file, | |||
| 2024 | 2024 | ||
| 2025 | case TIOCGICOUNT: | 2025 | case TIOCGICOUNT: |
| 2026 | cnow = mos7720_port->icount; | 2026 | cnow = mos7720_port->icount; |
| 2027 | |||
| 2028 | memset(&icount, 0, sizeof(struct serial_icounter_struct)); | ||
| 2029 | |||
| 2027 | icount.cts = cnow.cts; | 2030 | icount.cts = cnow.cts; |
| 2028 | icount.dsr = cnow.dsr; | 2031 | icount.dsr = cnow.dsr; |
| 2029 | icount.rng = cnow.rng; | 2032 | icount.rng = cnow.rng; |