ALSA: usb-audio: Don't attempt to get Lifecam HD-5000 sample rate

oampo · tiwai · commit b62b99801002 · 2015-02-17T07:20:04.000+01:00
Adds a quirk to disable the check that the sample rate has been set correctly, as the Lifecam does not support getting the sample rate.

This means that we don't need to wait for the USB timeout when attempting to get the sample rate. Waiting for the timeout causes problems in some applications, which give up on the device acquisition process before it has had time to complete, resulting in no sound.

[minor tidy up by tiwai]

Signed-off-by: Joe Turner &lt;joe@oampo.co.uk&gt;
Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
@@ -303,6 +303,11 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
 		return err;
 	}
 
+	/* Don't check the sample rate for devices which we know don't
+	 * support reading */
+	if (snd_usb_get_sample_rate_quirk(chip))
+		return 0;
+
 	if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR,
 				   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_IN,
 				   UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
@@ -1111,6 +1111,11 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
 	}
 }
 
+bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
+{
+	/* MS Lifecam HD-5000 doesn't support reading the sample rate. */
+	return chip->usb_id == USB_ID(0x045E, 0x076D);
+}
 
 /* Marantz/Denon USB DACs need a vendor cmd to switch
  * between PCM and native DSD mode
diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h
@@ -21,6 +21,8 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
 void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
 			      struct audioformat *fmt);
 
+bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip);
+
 int snd_usb_is_big_endian_format(struct snd_usb_audio *chip,
 				 struct audioformat *fp);
 

Original file line number	Diff line number	Diff line change
`@@ -1111,6 +1111,11 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,`
`1111`	`1111`	`}`
`1112`	`1112`	`}`
`1113`	`1113`
	`1114`	`+bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)`
	`1115`	`+{`
	`1116`	`+ /* MS Lifecam HD-5000 doesn't support reading the sample rate. */`
	`1117`	`+ return chip->usb_id == USB_ID(0x045E, 0x076D);`
	`1118`	`+}`
`1114`	`1119`
`1115`	`1120`	`/* Marantz/Denon USB DACs need a vendor cmd to switch`
`1116`	`1121`	`* between PCM and native DSD mode`