7 files changed, 42 insertions, 14 deletions

diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 83c605e8824c..66f488c13717 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -1128,8 +1128,8 @@ static void stir_disconnect(struct usb_interface *intf)
 }
 
 #ifdef CONFIG_PM
-/* Power management suspend, so power off the transmitter/receiver */
-static int stir_suspend(struct usb_interface *intf, u32 state)
+/* USB suspend, so power off the transmitter/receiver */
+static int stir_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct stir_cb *stir = usb_get_intfdata(intf);
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index fa0dc4f6de47..94f7d2d1faf6 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1731,7 +1731,7 @@ static int finish_port_resume(struct usb_device *udev)
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (intf->dev.power.power_state == PM_SUSPEND_ON)
+                        if (intf->dev.power.power_state == PMSG_SUSPEND)
                                 continue;
                         if (!intf->dev.driver) {
                                 /* FIXME maybe force to alt 0 */
@@ -1745,7 +1745,7 @@ static int finish_port_resume(struct usb_device *udev)
 
                         /* can we do better than just logging errors? */
                         status = driver->resume(intf);
-                        if (intf->dev.power.power_state != PM_SUSPEND_ON
+                        if (intf->dev.power.power_state != PMSG_ON
                                         || status)
                                 dev_dbg(&intf->dev,
                                         "resume fail, state %d code %d\n",
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index f0534ee06490..5e45996b5a44 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1382,13 +1382,13 @@ void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe,
                         usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
 }
 
-static int usb_generic_suspend(struct device *dev, u32 state)
+static int usb_generic_suspend(struct device *dev, pm_message_t message)
 {
         struct usb_interface *intf;
         struct usb_driver *driver;
 
         if (dev->driver == &usb_generic_driver)
-                return usb_suspend_device (to_usb_device(dev), state);
+                return usb_suspend_device (to_usb_device(dev), message);
 
         if ((dev->driver == NULL) ||
             (dev->driver_data == &usb_generic_driver_data))
@@ -1402,7 +1402,7 @@ static int usb_generic_suspend(struct device *dev, u32 state)
                 return 0;
 
         if (driver->suspend)
-                return driver->suspend(intf, state);
+                return driver->suspend(intf, message);
         return 0;
 }
 
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 7662cf4e2621..e625997694df 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1790,12 +1790,12 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         return 0;
 }
 
-static int hid_suspend(struct usb_interface *intf, u32 state)
+static int hid_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct hid_device *hid = usb_get_intfdata (intf);
 
         usb_kill_urb(hid->urbin);
-        intf->dev.power.power_state = state;
+        intf->dev.power.power_state = PMSG_SUSPEND;
         dev_dbg(&intf->dev, "suspend\n");
         return 0;
 }
@@ -1805,7 +1805,7 @@ static int hid_resume(struct usb_interface *intf)
         struct hid_device *hid = usb_get_intfdata (intf);
         int status;
 
-        intf->dev.power.power_state = PM_SUSPEND_ON;
+        intf->dev.power.power_state = PMSG_ON;
         if (hid->open)
                 status = usb_submit_urb(hid->urbin, GFP_NOIO);
         else
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index f6c19d73b7da..a02be795d63e 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -1364,11 +1364,18 @@ static void pegasus_disconnect(struct usb_interface *intf)
         free_netdev(pegasus->net);
 }
 
-static int pegasus_suspend (struct usb_interface *intf, pm_message_t state)
+static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
 {
         struct pegasus *pegasus = usb_get_intfdata(intf);
         
         netif_device_detach (pegasus->net);
+        if (netif_running(pegasus->net)) {
+                cancel_delayed_work(&pegasus->carrier_check);
+
+                usb_kill_urb(pegasus->rx_urb);
+                usb_kill_urb(pegasus->intr_urb);
+        }
+        intf->dev.power.power_state = PMSG_SUSPEND;
         return 0;
 }
 
@@ -1376,7 +1383,20 @@ static int pegasus_resume (struct usb_interface *intf)
 {
         struct pegasus *pegasus = usb_get_intfdata(intf);
 
+        intf->dev.power.power_state = PMSG_ON;
         netif_device_attach (pegasus->net);
+        if (netif_running(pegasus->net)) {
+                pegasus->rx_urb->status = 0;
+                pegasus->rx_urb->actual_length = 0;
+                read_bulk_callback(pegasus->rx_urb, 0);
+
+                pegasus->intr_urb->status = 0;
+                pegasus->intr_urb->actual_length = 0;
+                intr_callback(pegasus->intr_urb, 0);
+
+                queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
+                                        CARRIER_CHECK_DELAY);
+        }
         return 0;
 }
 
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index dd8b4456ea35..3e341b1ffdb1 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -3732,11 +3732,17 @@ out:
 
 #ifdef  CONFIG_PM
 
-static int usbnet_suspend (struct usb_interface *intf, u32 state)
+static int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
 {
         struct usbnet           *dev = usb_get_intfdata(intf);
         
+        /* accelerate emptying of the rx and queues, to avoid
+         * having everything error out.
+         */
         netif_device_detach (dev->net);
+        (void) unlink_urbs (dev, &dev->rxq);
+        (void) unlink_urbs (dev, &dev->txq);
+        intf->dev.power.power_state = PMSG_SUSPEND;
         return 0;
 }
 
@@ -3744,7 +3750,9 @@ static int usbnet_resume (struct usb_interface *intf)
 {
         struct usbnet           *dev = usb_get_intfdata(intf);
 
+        intf->dev.power.power_state = PMSG_ON;
         netif_device_attach (dev->net);
+        tasklet_schedule (&dev->bh);
         return 0;
 }
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index c96728435935..41d1a644c9d4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -558,7 +558,7 @@ struct usb_driver {
 
         int (*ioctl) (struct usb_interface *intf, unsigned int code, void *buf);
 
-        int (*suspend) (struct usb_interface *intf, u32 state);
+        int (*suspend) (struct usb_interface *intf, pm_message_t message);
         int (*resume) (struct usb_interface *intf);
 
         const struct usb_device_id *id_table;
@@ -977,7 +977,7 @@ extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
         int timeout);
 
 /* selective suspend/resume */
-extern int usb_suspend_device(struct usb_device *dev, u32 state);
+extern int usb_suspend_device(struct usb_device *dev, pm_message_t message);
 extern int usb_resume_device(struct usb_device *dev);