diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /drivers/usb/serial/mos7840.c | |
| parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
| parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 1c9b6e9b2386..1a42bc213799 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
| @@ -2285,6 +2285,9 @@ static int mos7840_ioctl(struct tty_struct *tty, struct file *file, | |||
| 2285 | case TIOCGICOUNT: | 2285 | case TIOCGICOUNT: |
| 2286 | cnow = mos7840_port->icount; | 2286 | cnow = mos7840_port->icount; |
| 2287 | smp_rmb(); | 2287 | smp_rmb(); |
| 2288 | |||
| 2289 | memset(&icount, 0, sizeof(struct serial_icounter_struct)); | ||
| 2290 | |||
| 2288 | icount.cts = cnow.cts; | 2291 | icount.cts = cnow.cts; |
| 2289 | icount.dsr = cnow.dsr; | 2292 | icount.dsr = cnow.dsr; |
| 2290 | icount.rng = cnow.rng; | 2293 | icount.rng = cnow.rng; |