Merge branch 'pm-runtime' into pm-for-linus

* pm-runtime:
  PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
  PM / Runtime: Replace dev_dbg() with trace_rpm_*()
  PM / Runtime: Introduce trace points for tracing rpm_* functions
  PM / Runtime: Don't run callbacks under lock for power.irq_safe set
  USB: Add wakeup info to debugging messages
  PM / Runtime: pm_runtime_idle() can be called in atomic context
  PM / Runtime: Add macro to test for runtime PM events
  PM / Runtime: Add might_sleep() to runtime PM functions

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index ce395fe5de26..f1c435ba5284 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1470,7 +1470,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
         if (!dev->suspend_count++) {
                 spin_lock_irq(&dev->txq.lock);
                 /* don't autosuspend while transmitting */
-                if (dev->txq.qlen && (message.event & PM_EVENT_AUTO)) {
+                if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
                         spin_unlock_irq(&dev->txq.lock);
                         return -EBUSY;
                 } else {