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

Commit 05288426 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

To merge HD-audio fixes back to 3.7 development line
parents b35aabd7 c302d613

sound/core/compress_offload.c

+3 −5
Original line number Diff line number Diff line
@@ -80,14 +80,12 @@ static int snd_compr_open(struct inode *inode, struct file *f) 
	int maj = imajor(inode);

	int ret;



	if (f->f_flags & O_WRONLY)

	if ((f->f_flags & O_ACCMODE) == O_WRONLY)

		dirn = SND_COMPRESS_PLAYBACK;

	else if (f->f_flags & O_RDONLY)

	else if ((f->f_flags & O_ACCMODE) == O_RDONLY)

		dirn = SND_COMPRESS_CAPTURE;

	else {

		pr_err("invalid direction\n");

	else

		return -EINVAL;

	}



	if (maj == snd_major)

		compr = snd_lookup_minor_data(iminor(inode),

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -2368,6 +2368,7 @@ int snd_hda_codec_reset(struct hda_codec *codec) 
	}

	if (codec->patch_ops.free)

		codec->patch_ops.free(codec);

	memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));

	snd_hda_jack_tbl_clear(codec);

	codec->proc_widget_hook = NULL;

	codec->spec = NULL;
@@ -2383,7 +2384,6 @@ int snd_hda_codec_reset(struct hda_codec *codec) 
	codec->num_pcms = 0;

	codec->pcm_info = NULL;

	codec->preset = NULL;

	memset(&codec->patch_ops, 0, sizeof(codec->patch_ops));

	codec->slave_dig_outs = NULL;

	codec->spdif_status_reset = 0;

	module_put(codec->owner);

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2796,6 +2796,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x1b43, "ASUS K53E", POS_FIX_POSBUF),

	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),

sound/pci/hda/patch_sigmatel.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ static struct snd_kcontrol_new stac_smux_mixer = { 


static const char * const slave_pfxs[] = {

	"Front", "Surround", "Center", "LFE", "Side",

	"Headphone", "Speaker", "IEC958",

	"Headphone", "Speaker", "IEC958", "PCM",

	NULL

};

sound/usb/card.c

+2 −2
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, 
				     struct snd_usb_audio *chip)

{

	struct snd_card *card;

	struct list_head *p;

	struct list_head *p, *n;



	if (chip == (void *)-1L)

		return;
@@ -570,7 +570,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, 
			snd_usb_stream_disconnect(p);

		}

		/* release the endpoint resources */

		list_for_each(p, &chip->ep_list) {

		list_for_each_safe(p, n, &chip->ep_list) {

			snd_usb_endpoint_free(p);

		}

		/* release the midi resources */