Commit 76df5296 authored Jul 18, 2016 by Kazuki Oikawa Committed by Takashi Iwai Jul 18, 2016

ALSA: usb-audio: Fix quirks code is not called



snd_usb_{set_interface,ctl_msg}_quirk checks chip->usb_id to need
calling a quirks code. But existed code path that not calling
dev_set_drvdata in usb_audio_probe.

Fixes: 79289e24 ("ALSA: usb-audio: Refer to chip->usb_id for quirks and MIDI creation")
Signed-off-by: Kazuki Oikawa <k@oikw.org>
Cc: <stable@vger.kernel.org> # v4.6+
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent d716fb03

sound/usb/card.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -556,7 +556,6 @@ static int usb_audio_probe(struct usb_interface *intf,
		goto __error;
		}
		chip = usb_chip[i];
		dev_set_drvdata(&dev->dev, chip);
		atomic_inc(&chip->active); /* avoid autopm */
		break;
		}
		@@ -582,6 +581,7 @@ static int usb_audio_probe(struct usb_interface *intf,
		goto __error;
		}
		}
		dev_set_drvdata(&dev->dev, chip);

		/*
		* For devices with more than one control interface, we assume the

Admin message