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: 79289e24194a ("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>

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 69860da..9e5276d 100644 (file)
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -556,7 +556,6 @@ static int usb_audio_probe(struct usb_interface *intf,
                                goto __error;
                        }
                        chip = usb_chip[i];
                                goto __error;
                        }
                        chip = usb_chip[i];

-                       dev_set_drvdata(&dev->dev, chip);

                        atomic_inc(&chip->active); /* avoid autopm */
                        break;
                }
                        atomic_inc(&chip->active); /* avoid autopm */
                        break;
                }


@@ -582,6 +581,7 @@ static int usb_audio_probe(struct usb_interface *intf,
                        goto __error;
                }
        }
                        goto __error;
                }
        }

+       dev_set_drvdata(&dev->dev, chip);

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