1 files changed, 21 insertions, 13 deletions

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 8e90891f0e42..198ce3cf378a 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -417,6 +417,11 @@ static const struct usb_device_id hso_ids[] = {
         {USB_DEVICE(0x0af0, 0x7401)},           /* GI 0401 */
         {USB_DEVICE(0x0af0, 0x7501)},           /* GTM 382 */
         {USB_DEVICE(0x0af0, 0x7601)},           /* GE40x */
+        {USB_DEVICE(0x0af0, 0x7701)},
+        {USB_DEVICE(0x0af0, 0x7801)},
+        {USB_DEVICE(0x0af0, 0x7901)},
+        {USB_DEVICE(0x0af0, 0x7361)},
+        {icon321_port_device(0x0af0, 0xd051)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, hso_ids);
@@ -658,10 +663,9 @@ static int hso_net_open(struct net_device *net)
         odev->rx_buf_missing = sizeof(struct iphdr);
         spin_unlock_irqrestore(&odev->net_lock, flags);
 
-        hso_start_net_device(odev->parent);
-
         /* We are up and running. */
         set_bit(HSO_NET_RUNNING, &odev->flags);
+        hso_start_net_device(odev->parent);
 
         /* Tell the kernel we are ready to start receiving from it */
         netif_start_queue(net);
@@ -2750,18 +2754,21 @@ static int hso_resume(struct usb_interface *iface)
                 if (network_table[i] &&
                     (network_table[i]->interface == iface)) {
                         hso_net = dev2net(network_table[i]);
-                        /* First transmit any lingering data, then restart the
-                         * device. */
-                        if (hso_net->skb_tx_buf) {
-                                dev_dbg(&iface->dev,
-                                        "Transmitting lingering data\n");
-                                hso_net_start_xmit(hso_net->skb_tx_buf,
-                                                   hso_net->net);
-                                hso_net->skb_tx_buf = NULL;
+                        if (hso_net->flags & IFF_UP) {
+                                /* First transmit any lingering data,
+                                   then restart the device. */
+                                if (hso_net->skb_tx_buf) {
+                                        dev_dbg(&iface->dev,
+                                                "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)
+                                        goto out;
                         }
-                        result = hso_start_net_device(network_table[i]);
-                        if (result)
-                                goto out;
                 }
         }
 
@@ -2894,6 +2901,7 @@ static struct usb_driver hso_driver = {
         .id_table = hso_ids,
         .suspend = hso_suspend,
         .resume = hso_resume,
+        .reset_resume = hso_resume,
         .supports_autosuspend = 1,
 };