diff options
| author | Kazuki Oikawa <k@oikw.org> | 2016-07-18 01:16:15 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 08:42:22 -0700 |
| commit | 3f5f500b1b660ee60558112c55f2464f341201e0 (patch) | |
| tree | 22fe93e9dbbf66b2a9933feb0c569e2c083f46e4 | |
| parent | 85d9c85417b55bd3ded0a45463374d2e52762b0d (diff) | |
| download | lwn-3f5f500b1b660ee60558112c55f2464f341201e0.tar.gz lwn-3f5f500b1b660ee60558112c55f2464f341201e0.zip | |
ALSA: usb-audio: Fix quirks code is not called
commit 76df52969711ae3725a98f26fbbc6a349803dcbf upstream.
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: 79289e24194a ("ALSA: usb-audio: Refer to chip->usb_id for quirks and MIDI creation")
Signed-off-by: Kazuki Oikawa <k@oikw.org>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/usb/card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 3fc63583a537..2d493501b7f6 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -552,7 +552,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; } @@ -578,6 +577,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 |