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

Commit fbcbe2b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Just a few small / trivial regression fixes at this time."

* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: ice1724: Use linear scale for AK4396 volume control.
  ALSA: hda_intel: add position_fix quirk for Asus K53E
  ALSA: compress_core: fix open flags test in snd_compr_open()
  ALSA: hda - Fix Oops at codec reset/reconfig
  ALSA: usb-audio: Fix bogus error messages for delay accounting
  ALSA: hda - Fix missing Master volume for STAC9200/925x
parents 6a2a2b85 3737e2be

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
@@ -2353,6 +2353,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;
@@ -2368,7 +2369,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
@@ -2701,6 +2701,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/pci/ice1712/prodigy_hifi.c

+2 −1
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static int ak4396_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem 
}



static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);

static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);



static struct snd_kcontrol_new prodigy_hd2_controls[] __devinitdata = {

    {
@@ -307,7 +308,7 @@ static struct snd_kcontrol_new prodigy_hd2_controls[] __devinitdata = { 
	.info = ak4396_dac_vol_info,

	.get = ak4396_dac_vol_get,

	.put = ak4396_dac_vol_put,

	.tlv = { .p = db_scale_wm_dac },

	.tlv = { .p = ak4396_db_scale },

    },

};