Commit 75c16b51 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Always set up the parameters after resume 



The commit 92adc96f ("ALSA: usb-audio: set the interface format
after resume on Dell WD19") introduced the workaround for the broken
setup after the resume specifically on a Dell dock model.  However,
the full setup should have been performed after the resume on all
devices, as we can't guarantee the same state.  So this patch removes
the conditional check and applies the workaround always.

Tested-by: default avatarKeith Milner <kamilner@superlative.org>
Tested-by: default avatarDylan Robinson <dylan_robinson@motu.com>
Link: https://lore.kernel.org/r/20201123085347.19667-24-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 96e221f3

sound/usb/pcm.c

+6 −14
Original line number Diff line number Diff line
@@ -1835,6 +1835,9 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea 
					      subs);

		subs->running = 1;

		return 0;

	case SNDRV_PCM_TRIGGER_SUSPEND:

		subs->need_setup_fmt = true;

		fallthrough;

	case SNDRV_PCM_TRIGGER_STOP:

		stop_endpoints(subs);

		snd_usb_endpoint_set_callback(subs->data_endpoint,
@@ -1849,13 +1852,6 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea 
					      subs);

		subs->running = 0;

		return 0;

	case SNDRV_PCM_TRIGGER_SUSPEND:

		if (subs->stream->chip->setup_fmt_after_resume_quirk) {

			stop_endpoints(subs);

			subs->need_setup_fmt = true;

			return 0;

		}

		break;

	}



	return -EINVAL;
@@ -1879,6 +1875,9 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream 
					      subs);

		subs->running = 1;

		return 0;

	case SNDRV_PCM_TRIGGER_SUSPEND:

		subs->need_setup_fmt = true;

		fallthrough;

	case SNDRV_PCM_TRIGGER_STOP:

		stop_endpoints(subs);

		fallthrough;
@@ -1887,13 +1886,6 @@ static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream 
					      NULL, NULL, NULL);

		subs->running = 0;

		return 0;

	case SNDRV_PCM_TRIGGER_SUSPEND:

		if (subs->stream->chip->setup_fmt_after_resume_quirk) {

			stop_endpoints(subs);

			subs->need_setup_fmt = true;

			return 0;

		}

		break;

	}



	return -EINVAL;

sound/usb/quirks-table.h

+0 −8
Original line number Diff line number Diff line
@@ -3256,14 +3256,6 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 
		}

	}

},

/* Dell WD19 Dock */

{

	USB_DEVICE(0x0bda, 0x402e),

	.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {

		.ifnum = QUIRK_ANY_INTERFACE,

		.type = QUIRK_SETUP_FMT_AFTER_RESUME

	}

},

/* MOTU Microbook II */

{

	USB_DEVICE_VENDOR_SPEC(0x07fd, 0x0004),

sound/usb/quirks.c

+0 −11
Original line number Diff line number Diff line
@@ -508,16 +508,6 @@ static int create_standard_mixer_quirk(struct snd_usb_audio *chip, 
	return snd_usb_create_mixer(chip, quirk->ifnum, 0);

}





static int setup_fmt_after_resume_quirk(struct snd_usb_audio *chip,

				       struct usb_interface *iface,

				       struct usb_driver *driver,

				       const struct snd_usb_audio_quirk *quirk)

{

	chip->setup_fmt_after_resume_quirk = 1;

	return 1;	/* Continue with creating streams and mixer */

}



static int setup_disable_autosuspend(struct snd_usb_audio *chip,

				       struct usb_interface *iface,

				       struct usb_driver *driver,
@@ -565,7 +555,6 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip, 
		[QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk,

		[QUIRK_AUDIO_ALIGN_TRANSFER] = create_align_transfer_quirk,

		[QUIRK_AUDIO_STANDARD_MIXER] = create_standard_mixer_quirk,

		[QUIRK_SETUP_FMT_AFTER_RESUME] = setup_fmt_after_resume_quirk,

		[QUIRK_SETUP_DISABLE_AUTOSUSPEND] = setup_disable_autosuspend,

	};

sound/usb/usbaudio.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct snd_usb_audio { 
	wait_queue_head_t shutdown_wait;

	unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */

	unsigned int tx_length_quirk:1; /* Put length specifier in transfers */

	unsigned int setup_fmt_after_resume_quirk:1; /* setup the format to interface after resume */

	unsigned int need_delayed_register:1; /* warn for delayed registration */

	int num_interfaces;

	int num_suspended_intf;