summaryrefslogtreecommitdiffstats
path: root/sound/usb/usx2y
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-05-25 08:50:03 +0200
committerTakashi Iwai <tiwai@suse.de>2021-05-25 08:50:03 +0200
commitf20fdd4362e31a02c24048af2eca735b59dacf78 (patch)
treebae1e962be6d441163aa5cfb29e4d3b34bd51343 /sound/usb/usx2y
parentALSA: firewire-lib: code refactoring for transfer delay (diff)
parentALSA: pcm: Block the release until the system resume finishes (diff)
downloadlinux-f20fdd4362e31a02c24048af2eca735b59dacf78.tar.xz
linux-f20fdd4362e31a02c24048af2eca735b59dacf78.zip
Merge branch 'topic/pci-rescan-prep-v2' into for-next
Pull PCI rescan prep work. Link: https://lore.kernel.org/r/20210523090920.15345-1-tiwai@suse.de
Diffstat (limited to 'sound/usb/usx2y')
-rw-r--r--sound/usb/usx2y/us122l.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index 0b0a87a631a0..e558931cce16 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -385,7 +385,7 @@ static int usb_stream_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
if (cfg.period_frames < min_period_frames)
return -EINVAL;
- snd_power_wait(hw->card, SNDRV_CTL_POWER_D0);
+ snd_power_wait(hw->card);
mutex_lock(&us122l->mutex);
s = us122l->sk.s;