git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
drivers
/
usb
/
serial
/
mos7840.c
diff --git
a/drivers/usb/serial/mos7840.c
b/drivers/usb/serial/mos7840.c
index
1c9b6e9
..
1a42bc2
100644
(file)
--- 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,
case TIOCGICOUNT:
cnow = mos7840_port->icount;
smp_rmb();
+
+ memset(&icount, 0, sizeof(struct serial_icounter_struct));
+
icount.cts = cnow.cts;
icount.dsr = cnow.dsr;
icount.rng = cnow.rng;