diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-08-21 19:26:48 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-08-21 19:26:48 +0200 |
commit | 00833d70ca29a9d60c694b9475a9d3327ed9461e (patch) | |
tree | 48ae16d7d4c1ca370ff223279b49602c6d3f44a9 /sound/usb | |
parent | fa4f18b4f402d3654415935511d8e0bb51a102b7 (diff) | |
parent | f6b28e4ded45bb91bc4cd115d55e35badedfce5f (diff) | |
download | op-kernel-dev-00833d70ca29a9d60c694b9475a9d3327ed9461e.zip op-kernel-dev-00833d70ca29a9d60c694b9475a9d3327ed9461e.tar.gz |
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 1fab977..0450593 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 754e689..00ebc0c 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) |