Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

3 files changed, 43 insertions, 1 deletions

diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 4cbb408af727..8a945f4f3693 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -1429,7 +1429,7 @@ static int generic_cdc_bind (struct usbnet *dev, struct usb_interface *intf)
                         info->ether = (void *) buf;
                         if (info->ether->bLength != sizeof *info->ether) {
                                 dev_dbg (&intf->dev, "CDC ether len %u\n",
-                                        info->u->bLength);
+                                        info->ether->bLength);
                                 goto bad_desc;
                         }
                         dev->net->mtu = le16_to_cpup (
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
index 341ae5f732dd..3b387b005739 100644
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@ -1884,12 +1884,53 @@ static void zd1201_disconnect(struct usb_interface *interface)
         kfree(zd);
 }
 
+#ifdef CONFIG_PM
+
+static int zd1201_suspend(struct usb_interface *interface,
+                           pm_message_t message)
+{
+        struct zd1201 *zd = usb_get_intfdata(interface);
+
+        netif_device_detach(zd->dev);
+
+        zd->was_enabled = zd->mac_enabled;
+
+        if (zd->was_enabled)
+                return zd1201_disable(zd);
+        else
+                return 0;
+}
+
+static int zd1201_resume(struct usb_interface *interface)
+{
+        struct zd1201 *zd = usb_get_intfdata(interface);
+
+        if (!zd || !zd->dev)
+                return -ENODEV;
+
+        netif_device_attach(zd->dev);
+
+        if (zd->was_enabled)
+                return zd1201_enable(zd);
+        else
+                return 0;
+}
+
+#else
+
+#define zd1201_suspend NULL
+#define zd1201_resume  NULL
+
+#endif
+
 static struct usb_driver zd1201_usb = {
         .owner = THIS_MODULE,
         .name = "zd1201",
         .probe = zd1201_probe,
         .disconnect = zd1201_disconnect,
         .id_table = zd1201_table,
+        .suspend = zd1201_suspend,
+        .resume = zd1201_resume,
 };
 
 static int __init zd1201_init(void)
diff --git a/drivers/usb/net/zd1201.h b/drivers/usb/net/zd1201.h
index 1627c71e8052..235f0ee34b24 100644
--- a/drivers/usb/net/zd1201.h
+++ b/drivers/usb/net/zd1201.h
@@ -46,6 +46,7 @@ struct zd1201 {
         char                    essid[IW_ESSID_MAX_SIZE+1];
         int                     essidlen;
         int                     mac_enabled;
+        int                     was_enabled;
         int                     monitor;
         int                     encode_enabled;
         int                     encode_restricted;