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

Commit 308c470b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Nothing particular stands out, only a few small fixes for USB-audio,
  HD-audio and Firewire. The USB-audio fix is the respin of the previous
  race fix after a revert due to the regression"

* tag 'sound-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  Revert "ALSA: firewire-lib: change structure member with proper type"
  ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion
  ALSA: usb-audio: Fix irq/process data synchronization
  ALSA: hda - Apply asus-mode8 fixup to ASUS X71SL
  ALSA: hda - Fix up GPIO for ASUS ROG Ranger
  ALSA: firewire-lib: change structure member with proper type
  ALSA: firewire-tascam: Fix to handle error from initialization of stream data
  ALSA: fireworks: fix asymmetric API call at unit removal
parents d72f0ded e4f34cf6

sound/firewire/fireworks/fireworks_stream.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ destroy_stream(struct snd_efw *efw, struct amdtp_stream *stream) 
		conn = &efw->in_conn;



	amdtp_stream_destroy(stream);

	cmp_connection_destroy(&efw->out_conn);

	cmp_connection_destroy(conn);

}



static int

sound/firewire/tascam/tascam-stream.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ int snd_tscm_stream_init_duplex(struct snd_tscm *tscm) 
	if (err < 0)

		amdtp_stream_destroy(&tscm->rx_stream);



	return 0;

	return err;

}



/* At bus reset, streaming is stopped and some registers are clear. */

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -2230,6 +2230,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC),

	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),

	SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS),

	SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3),

	SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),

	SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),

	SND_PCI_QUIRK(0x104d, 0x9043, "Sony Vaio VGC-LN51JGB", ALC882_FIXUP_NO_PRIMARY_HP),
@@ -6983,6 +6984,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),

	SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),

	SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),

	SND_PCI_QUIRK(0x1043, 0x1963, "ASUS X71SL", ALC662_FIXUP_ASUS_MODE8),

	SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),

	SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),

	SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),

sound/usb/endpoint.c

+10 −10
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ static void snd_complete_urb(struct urb *urb) 
	if (unlikely(atomic_read(&ep->chip->shutdown)))

		goto exit_clear;



	if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))

		goto exit_clear;



	if (usb_pipeout(ep->pipe)) {

		retire_outbound_urb(ep, ctx);

		/* can be stopped during retire callback */
@@ -534,6 +537,11 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep) 
			alive, ep->ep_num);

	clear_bit(EP_FLAG_STOPPING, &ep->flags);



	ep->data_subs = NULL;

	ep->sync_slave = NULL;

	ep->retire_data_urb = NULL;

	ep->prepare_data_urb = NULL;



	return 0;

}
@@ -913,8 +921,6 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, 
 * snd_usb_endpoint_start: start an snd_usb_endpoint

 *

 * @ep: the endpoint to start

 * @can_sleep:	flag indicating whether the operation is executed in

 * 		non-atomic context

 *

 * A call to this function will increment the use count of the endpoint.

 * In case it is not already running, the URBs for this endpoint will be
@@ -924,7 +930,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, 
 *

 * Returns an error if the URB submission failed, 0 in all other cases.

 */

int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep)

int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)

{

	int err;

	unsigned int i;
@@ -938,8 +944,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep) 


	/* just to be sure */

	deactivate_urbs(ep, false);

	if (can_sleep)

		wait_clear_urbs(ep);



	ep->active_mask = 0;

	ep->unlink_mask = 0;
@@ -1020,10 +1024,6 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep) 


	if (--ep->use_count == 0) {

		deactivate_urbs(ep, false);

		ep->data_subs = NULL;

		ep->sync_slave = NULL;

		ep->retire_data_urb = NULL;

		ep->prepare_data_urb = NULL;

		set_bit(EP_FLAG_STOPPING, &ep->flags);

	}

}

sound/usb/endpoint.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, 
				struct audioformat *fmt,

				struct snd_usb_endpoint *sync_ep);



int  snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep);

int  snd_usb_endpoint_start(struct snd_usb_endpoint *ep);

void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep);

void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep);

int  snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);