* [GIT PULL] sound fixes for 4.19-rc7
@ 2018-10-05 9:51 Takashi Iwai
2018-10-05 23:06 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Iwai @ 2018-10-05 9:51 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Linus Torvalds, Linux Kernel Mailing List
Greg,
please pull sound fixes for v4.19-rc7 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.19-rc7
The topmost commit is 709ae62e8e6d9ac4df7dadb3b8ae432675c45ef9
----------------------------------------------------------------
sound fixes for 4.19-rc7
Just two small fixes for HD-audio: one is for a typo in completion
timeout, and another a fixup for Dell machines as usual
----------------------------------------------------------------
Kai-Heng Feng (1):
ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760
Takashi Iwai (1):
ALSA: hda: Fix the audio-component completion timeout
---
sound/hda/hdac_i915.c | 4 +++-
sound/pci/hda/patch_realtek.c | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index b5282cbbe489..617ff1aa818f 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -145,9 +145,11 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
if (!acomp->ops) {
request_module("i915");
/* 10s timeout */
- wait_for_completion_timeout(&bind_complete, 10 * 1000);
+ wait_for_completion_timeout(&bind_complete,
+ msecs_to_jiffies(10 * 1000));
}
if (!acomp->ops) {
+ dev_info(bus->dev, "couldn't bind with audio component\n");
snd_hdac_acomp_exit(bus);
return -ENODEV;
}
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 1d117f00d04d..3ac7ba9b342d 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6409,6 +6409,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x1028, 0x0706, "Dell Inspiron 7559", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),
SND_PCI_QUIRK(0x1028, 0x0725, "Dell Inspiron 3162", ALC255_FIXUP_DELL_SPK_NOISE),
SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
+ SND_PCI_QUIRK(0x1028, 0x075c, "Dell XPS 27 7760", ALC298_FIXUP_SPK_VOLUME),
SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),
SND_PCI_QUIRK(0x1028, 0x07b0, "Dell Precision 7520", ALC295_FIXUP_DISABLE_DAC3),
SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [GIT PULL] sound fixes for 4.19-rc7
2018-10-05 9:51 [GIT PULL] sound fixes for 4.19-rc7 Takashi Iwai
@ 2018-10-05 23:06 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2018-10-05 23:06 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Linus Torvalds, Linux Kernel Mailing List
On Fri, Oct 05, 2018 at 11:51:17AM +0200, Takashi Iwai wrote:
> Greg,
>
> please pull sound fixes for v4.19-rc7 from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.19-rc7
Now merged, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-05 23:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-05 9:51 [GIT PULL] sound fixes for 4.19-rc7 Takashi Iwai
2018-10-05 23:06 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.