diff options
| author | Takashi Iwai | 2015-08-21 19:26:48 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-08-21 19:26:48 +0200 |
| commit | 00833d70ca29a9d60c694b9475a9d3327ed9461e (patch) | |
| tree | 48ae16d7d4c1ca370ff223279b49602c6d3f44a9 /sound/usb | |
| parent | ALSA: hda - Refresh widgets sysfs at probing Haswell+ HDMI codecs (diff) | |
| parent | ALSA: hda - Shutdown CX20722 on reboot/free to avoid spurious noises (diff) | |
| download | kernel-qcow2-linux-00833d70ca29a9d60c694b9475a9d3327ed9461e.tar.gz kernel-qcow2-linux-00833d70ca29a9d60c694b9475a9d3327ed9461e.tar.xz kernel-qcow2-linux-00833d70ca29a9d60c694b9475a9d3327ed9461e.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.c | 2 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 1fab9778807a..0450593980fd 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -638,7 +638,7 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) int err = -ENODEV; down_read(&chip->shutdown_rwsem); - if (chip->probing && chip->in_pm) + if (chip->probing || chip->in_pm) err = 0; else if (!chip->shutdown) err = usb_autopm_get_interface(chip->pm_intf); diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 754e689596a2..00ebc0ca008e 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1268,6 +1268,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + case USB_ID(0x20b1, 0x000a): /* Gustard DAC-X20U */ case USB_ID(0x20b1, 0x2009): /* DIYINHK DSD DXD 384kHz USB to I2S/DSD */ case USB_ID(0x20b1, 0x2023): /* JLsounds I2SoverUSB */ if (fp->altsetting == 3) |