Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+19
-12
+1
sound/drivers/dummy.c
+1
sound/drivers/dummy.c
+2
-2
sound/hda/hdac_regmap.c
+2
-2
sound/hda/hdac_regmap.c
···
444
444
err = reg_raw_write(codec, reg, val);
445
445
if (err == -EAGAIN) {
446
446
err = snd_hdac_power_up_pm(codec);
447
-
if (!err)
447
+
if (err >= 0)
448
448
err = reg_raw_write(codec, reg, val);
449
449
snd_hdac_power_down_pm(codec);
450
450
}
···
470
470
err = reg_raw_read(codec, reg, val, uncached);
471
471
if (err == -EAGAIN) {
472
472
err = snd_hdac_power_up_pm(codec);
473
-
if (!err)
473
+
if (err >= 0)
474
474
err = reg_raw_read(codec, reg, val, uncached);
475
475
snd_hdac_power_down_pm(codec);
476
476
}
+10
-10
sound/pci/hda/hda_tegra.c
+10
-10
sound/pci/hda/hda_tegra.c
···
115
115
/*
116
116
* Register access ops. Tegra HDA register access is DWORD only.
117
117
*/
118
-
static void hda_tegra_writel(u32 value, u32 *addr)
118
+
static void hda_tegra_writel(u32 value, u32 __iomem *addr)
119
119
{
120
120
writel(value, addr);
121
121
}
122
122
123
-
static u32 hda_tegra_readl(u32 *addr)
123
+
static u32 hda_tegra_readl(u32 __iomem *addr)
124
124
{
125
125
return readl(addr);
126
126
}
127
127
128
-
static void hda_tegra_writew(u16 value, u16 *addr)
128
+
static void hda_tegra_writew(u16 value, u16 __iomem *addr)
129
129
{
130
130
unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
131
-
void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
131
+
void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
132
132
u32 v;
133
133
134
134
v = readl(dword_addr);
···
137
137
writel(v, dword_addr);
138
138
}
139
139
140
-
static u16 hda_tegra_readw(u16 *addr)
140
+
static u16 hda_tegra_readw(u16 __iomem *addr)
141
141
{
142
142
unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
143
-
void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
143
+
void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
144
144
u32 v;
145
145
146
146
v = readl(dword_addr);
147
147
return (v >> shift) & 0xffff;
148
148
}
149
149
150
-
static void hda_tegra_writeb(u8 value, u8 *addr)
150
+
static void hda_tegra_writeb(u8 value, u8 __iomem *addr)
151
151
{
152
152
unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
153
-
void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
153
+
void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
154
154
u32 v;
155
155
156
156
v = readl(dword_addr);
···
159
159
writel(v, dword_addr);
160
160
}
161
161
162
-
static u8 hda_tegra_readb(u8 *addr)
162
+
static u8 hda_tegra_readb(u8 __iomem *addr)
163
163
{
164
164
unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
165
-
void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
165
+
void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3);
166
166
u32 v;
167
167
168
168
v = readl(dword_addr);
+6
sound/pci/hda/patch_realtek.c
+6
sound/pci/hda/patch_realtek.c
···
5650
5650
SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),
5651
5651
SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),
5652
5652
SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
5653
+
SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),
5654
+
SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),
5653
5655
SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
5654
5656
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
5655
5657
SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
···
5831
5829
{0x21, 0x02211030}),
5832
5830
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5833
5831
{0x12, 0x90a60160},
5832
+
{0x14, 0x90170120},
5833
+
{0x21, 0x02211030}),
5834
+
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5835
+
{0x12, 0x90a60170},
5834
5836
{0x14, 0x90170120},
5835
5837
{0x21, 0x02211030}),
5836
5838
SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,