diff options
author | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
commit | b18e30412dde08536c9df6eae3f571fddb560e7f (patch) | |
tree | 1ca4e3ea848d3035311f29a6f03cb884e82e6639 /drivers/net/usb/hso.c | |
parent | 09bf825e8e3049db1d72d464d0a6b857cc037a43 (diff) | |
parent | f2455eb176ac87081bbfc9a44b21c7cd2bc1967e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb/hso.c')
-rw-r--r-- | drivers/net/usb/hso.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 1b7cac77159..6e42b5a8c22 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -397,7 +397,7 @@ static const struct usb_device_id hso_ids[] = { {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */ {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */ {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */ - {default_port_device(0x0af0, 0xd033)}, /* Icon-322 */ + {icon321_port_device(0x0af0, 0xd033)}, /* Icon-322 */ {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */ {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */ {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */ @@ -2613,6 +2613,7 @@ static int hso_resume(struct usb_interface *iface) "Transmitting lingering data\n"); hso_net_start_xmit(hso_net->skb_tx_buf, hso_net->net); + hso_net->skb_tx_buf = NULL; } result = hso_start_net_device(network_table[i]); if (result) |