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

kazuki · tiwai · commit 76df52969711 · 2016-07-18T12:32:45.000+02:00
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: 79289e2 ("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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,6 @@ static int usb_audio_probe(struct usb_interface *intf,`
`556`	`556`	`goto __error;`
`557`	`557`	`}`
`558`	`558`	`chip = usb_chip[i];`
`559`		`- dev_set_drvdata(&dev->dev, chip);`
`560`	`559`	`atomic_inc(&chip->active); /* avoid autopm */`
`561`	`560`	`break;`
`562`	`561`	`}`
`@@ -582,6 +581,7 @@ static int usb_audio_probe(struct usb_interface *intf,`
`582`	`581`	`goto __error;`
`583`	`582`	`}`
`584`	`583`	`}`
	`584`	`+ dev_set_drvdata(&dev->dev, chip);`
`585`	`585`
`586`	`586`	`/*`
`587`	`587`	`* For devices with more than one control interface, we assume the`