Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / drivers / usb / class / cdc-wdm.c

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 1103ce7016b13e6cc28114b0ec5088ff2336584f..7e8e1235e4e52d93cf3aa0ab930a7cce618bc7ea 100644 (file)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -750,12 +750,16 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
        dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
 
        mutex_lock(&desc->plock);
+#ifdef CONFIG_PM
        if (interface_to_usbdev(desc->intf)->auto_pm && test_bit(WDM_IN_USE, &desc->flags)) {
                rv = -EBUSY;
        } else {
+#endif
                cancel_work_sync(&desc->rxwork);
                kill_urbs(desc);
+#ifdef CONFIG_PM
        }
+#endif
        mutex_unlock(&desc->plock);
 
        return rv;