Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76df5296 authored by Kazuki Oikawa's avatar Kazuki Oikawa Committed by Takashi Iwai
Browse files

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: default avatarKazuki Oikawa <k@oikw.org>
Cc: <stable@vger.kernel.org> # v4.6+
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi 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