diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /drivers/net/usb | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/hso.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 4f123f869bdc..8110595fbbcc 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
| @@ -1643,6 +1643,8 @@ static int hso_get_count(struct hso_serial *serial, | |||
| 1643 | struct uart_icount cnow; | 1643 | struct uart_icount cnow; |
| 1644 | struct hso_tiocmget *tiocmget = serial->tiocmget; | 1644 | struct hso_tiocmget *tiocmget = serial->tiocmget; |
| 1645 | 1645 | ||
| 1646 | memset(&icount, 0, sizeof(struct serial_icounter_struct)); | ||
| 1647 | |||
| 1646 | if (!tiocmget) | 1648 | if (!tiocmget) |
| 1647 | return -ENOENT; | 1649 | return -ENOENT; |
| 1648 | spin_lock_irq(&serial->serial_lock); | 1650 | spin_lock_irq(&serial->serial_lock); |