diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-12-07 11:40:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-12-07 11:40:04 +0100 |
| commit | 2bff7e97ebbb1119e9f22936706294f4e85d4db6 (patch) | |
| tree | a2afac81b24649749d546feb6af966f813eb7dd2 /sound/usb | |
| parent | 157ab88ef64a2edccd722f120464109ceba9bac1 (diff) | |
| parent | bde1a7459623a66c2abec4d0a841e4b06cc88d9a (diff) | |
| download | linux-stable-2bff7e97ebbb1119e9f22936706294f4e85d4db6.tar.gz linux-stable-2bff7e97ebbb1119e9f22936706294f4e85d4db6.tar.bz2 linux-stable-2bff7e97ebbb1119e9f22936706294f4e85d4db6.zip | |
Merge branch 'for-linus' into for-next
Back-merge for applying the more HD-audio quirks on top of the latest
code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.c | 5 | ||||
| -rw-r--r-- | sound/usb/quirks-table.h | 10 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 2bfe4e80a6b9..a105947eaf55 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -682,9 +682,12 @@ static int usb_audio_probe(struct usb_interface *intf, __error: if (chip) { + /* chip->active is inside the chip->card object, + * decrement before memory is possibly returned. + */ + atomic_dec(&chip->active); if (!chip->num_interfaces) snd_card_free(chip->card); - atomic_dec(&chip->active); } mutex_unlock(®ister_mutex); return err; diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 849953e5775c..37fc0447c071 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3382,5 +3382,15 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), .ifnum = QUIRK_NO_INTERFACE } }, +/* Dell WD19 Dock */ +{ + USB_DEVICE(0x0bda, 0x402e), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "Dell", + .product_name = "WD19 Dock", + .profile_name = "Dell-WD15-Dock", + .ifnum = QUIRK_NO_INTERFACE + } +}, #undef USB_DEVICE_VENDOR_SPEC diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 3d0f09108c98..96340f23f86d 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1492,6 +1492,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + case USB_ID(0x152a, 0x85de): /* SMSL D1 DAC */ case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */ case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */ case USB_ID(0x16b0, 0x06b2): /* NuPrime DAC-10 */ |