Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[mv-sheeva.git] / drivers / usb / class / cdc-wdm.c

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 5a8ecc045e3facb1ae6abee89867d68cf63eabb4..3771d6e6d0ccb95587c2bf3ca9de5e6fdf492348 100644 (file)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -764,7 +764,8 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
 
        mutex_lock(&desc->plock);
 #ifdef CONFIG_PM
-       if (interface_to_usbdev(desc->intf)->auto_pm && test_bit(WDM_IN_USE, &desc->flags)) {
+       if ((message.event & PM_EVENT_AUTO) &&
+                       test_bit(WDM_IN_USE, &desc->flags)) {
                rv = -EBUSY;
        } else {
 #endif