git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
sound
/
usb
/
card.c
diff --git
a/sound/usb/card.c
b/sound/usb/card.c
index
c1575ea
..
05c1aae
100644
(file)
--- 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) {