summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-26 09:27:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-26 09:27:21 -0800
commitc213341e4962c798274e024e89dd4b14d4826872 (patch)
tree2a2a2f3bb7bafa00d0c31b13d212530728bd46ac /include
parentbb134ff50709fda187027c2263036ccb41024ca5 (diff)
parent473f414564528a819f0c2bb6b4bf26366b64c9ab (diff)
downloadlinux-stable-c213341e4962c798274e024e89dd4b14d4826872.tar.gz
linux-stable-c213341e4962c798274e024e89dd4b14d4826872.tar.bz2
linux-stable-c213341e4962c798274e024e89dd4b14d4826872.zip
Merge tag 'sound-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Things got calmed down for rc6, as it seems, and we have only a few HD-audio fixes at this time: a fix for Skylake codec probe errors, a fix for missing interrupt handling, and a few Dell and HP quirks" * tag 'sound-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Loop interrupt handling until really cleared ALSA: hda - Fix headset support and noise on HP EliteBook 755 G2 ALSA: hda - Fixup speaker pass-through control for nid 0x14 on ALC225 ALSA: hda - Fixing background noise on Dell Inspiron 3162 ALSA: hda - Apply clock gate workaround to Skylake, too
Diffstat (limited to 'include')
-rw-r--r--include/sound/hdaudio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index e2b712c90d3f..c21c38ce7450 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -343,7 +343,7 @@ void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus);
void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus);
void snd_hdac_bus_update_rirb(struct hdac_bus *bus);
-void snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,
+int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status,
void (*ack)(struct hdac_bus *,
struct hdac_stream *));