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

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

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

Pull sound fixes from Takashi Iwai:
 "Again pretty calm weeks: we've had only a few trivial / stable
  HD-audio fixes in addition to a possible race fix for snd-dummy driver
  spotted by syzkaller"

* tag 'sound-4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: dummy: Fix a use-after-free at closing
  ALSA: hda / realtek - add two more Thinkpad IDs (5050,5053) for tpt460 fixup
  ALSA: hda - Fix the headset mic jack detection on Dell machine
  ALSA: hda/tegra: iomem fixups for sparse warnings
  ALSA: hdac_regmap - fix the register access for runtime PM
parents 9a949a98 d5dbbe65

sound/drivers/dummy.c

+1 −0
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream) 


static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)

{

	hrtimer_cancel(&dpcm->timer);

	tasklet_kill(&dpcm->tasklet);

}

sound/hda/hdac_regmap.c

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg, 
	err = reg_raw_write(codec, reg, val);

	if (err == -EAGAIN) {

		err = snd_hdac_power_up_pm(codec);

		if (!err)

		if (err >= 0)

			err = reg_raw_write(codec, reg, val);

		snd_hdac_power_down_pm(codec);

	}
@@ -470,7 +470,7 @@ static int __snd_hdac_regmap_read_raw(struct hdac_device *codec, 
	err = reg_raw_read(codec, reg, val, uncached);

	if (err == -EAGAIN) {

		err = snd_hdac_power_up_pm(codec);

		if (!err)

		if (err >= 0)

			err = reg_raw_read(codec, reg, val, uncached);

		snd_hdac_power_down_pm(codec);

	}

sound/pci/hda/hda_tegra.c

+10 −10
Original line number Diff line number Diff line
@@ -115,20 +115,20 @@ static int substream_free_pages(struct azx *chip, 
/*

 * Register access ops. Tegra HDA register access is DWORD only.

 */

static void hda_tegra_writel(u32 value, u32 *addr)

static void hda_tegra_writel(u32 value, u32 __iomem *addr)

{

	writel(value, addr);

}



static u32 hda_tegra_readl(u32 *addr)

static u32 hda_tegra_readl(u32 __iomem *addr)

{

	return readl(addr);

}



static void hda_tegra_writew(u16 value, u16 *addr)

static void hda_tegra_writew(u16 value, u16 __iomem  *addr)

{

	unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;

	void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);

	void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);

	u32 v;



	v = readl(dword_addr);
@@ -137,20 +137,20 @@ static void hda_tegra_writew(u16 value, u16 *addr) 
	writel(v, dword_addr);

}



static u16 hda_tegra_readw(u16 *addr)

static u16 hda_tegra_readw(u16 __iomem *addr)

{

	unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;

	void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);

	void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);

	u32 v;



	v = readl(dword_addr);

	return (v >> shift) & 0xffff;

}



static void hda_tegra_writeb(u8 value, u8 *addr)

static void hda_tegra_writeb(u8 value, u8 __iomem *addr)

{

	unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;

	void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);

	void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);

	u32 v;



	v = readl(dword_addr);
@@ -159,10 +159,10 @@ static void hda_tegra_writeb(u8 value, u8 *addr) 
	writel(v, dword_addr);

}



static u8 hda_tegra_readb(u8 *addr)

static u8 hda_tegra_readb(u8 __iomem *addr)

{

	unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;

	void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);

	void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);

	u32 v;



	v = readl(dword_addr);

sound/pci/hda/patch_realtek.c

+6 −0
Original line number Diff line number Diff line
@@ -5650,6 +5650,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),

	SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),

	SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),

	SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
@@ -5831,6 +5833,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x12, 0x90a60160},

		{0x14, 0x90170120},

		{0x21, 0x02211030}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		{0x12, 0x90a60170},

		{0x14, 0x90170120},

		{0x21, 0x02211030}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		ALC256_STANDARD_PINS),

	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,