diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 17:16:55 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-07 17:16:55 -0400 |
| commit | d727b60659a1173eb4142a5fc521ce67c28b34e1 (patch) | |
| tree | 793d0fc86ecf98331024db5c86bc271cc72aa2d2 /sound/usb | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
| parent | 2a5306cc5f383b0e7414c75e458111afd4a563a4 (diff) | |
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
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.c | 2 |
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) | |||
| 631 | if (chip == (void *)-1L) | 631 | if (chip == (void *)-1L) |
| 632 | return 0; | 632 | return 0; |
| 633 | 633 | ||
| 634 | if (!(message.event & PM_EVENT_AUTO)) { | 634 | if (!PMSG_IS_AUTO(message)) { |
| 635 | snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); | 635 | snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); |
| 636 | if (!chip->num_suspended_intf++) { | 636 | if (!chip->num_suspended_intf++) { |
| 637 | list_for_each(p, &chip->pcm_list) { | 637 | list_for_each(p, &chip->pcm_list) { |