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/sound/usb/card.c b/sound/usb/card.c
index d8f2bf401458..3068f043099a 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -631,7 +631,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
         if (chip == (void *)-1L)
                 return 0;
 
-        if (!(message.event & PM_EVENT_AUTO)) {
+        if (!PMSG_IS_AUTO(message)) {
                 snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
                 if (!chip->num_suspended_intf++) {
                         list_for_each(p, &chip->pcm_list) {