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

Commit f0597a41 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] usb-audio: don't call usb_reset_configuration() when probing 



Modules: USB generic driver

Remove the usb_reset_configuration() call from the probe callback
because it isn't needed and it may interfere with other drivers
already loaded for the device.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent 00f226d4

sound/usb/usbaudio.c

+0 −7
Original line number Diff line number Diff line
@@ -3212,7 +3212,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, 
				 struct usb_interface *intf,

				 const struct usb_device_id *usb_id)

{

	struct usb_host_config *config = dev->actconfig;

	const snd_usb_audio_quirk_t *quirk = (const snd_usb_audio_quirk_t *)usb_id->driver_info;

	int i, err;

	snd_usb_audio_t *chip;
@@ -3233,7 +3232,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, 
	if (id == USB_ID(0x041e, 0x3000)) {

		if (snd_usb_extigy_boot_quirk(dev, intf) < 0)

			goto __err_val;

		config = dev->actconfig;

	}

	/* SB Audigy 2 NX needs its own boot-up magic, too */

	if (id == USB_ID(0x041e, 0x3020)) {
@@ -3262,11 +3260,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, 
		/* it's a fresh one.

		 * now look for an empty slot and create a new card instance

		 */

		/* first, set the current configuration for this device */

		if (usb_reset_configuration(dev) < 0) {

			snd_printk(KERN_ERR "cannot reset configuration (value 0x%x)\n", get_cfg_desc(config)->bConfigurationValue);

			goto __error;

		}

		for (i = 0; i < SNDRV_CARDS; i++)

			if (enable[i] && ! usb_chip[i] &&

			    (vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) &&