summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-05-17 12:45:31 +0200
committerTakashi Iwai <tiwai@suse.de>2016-05-17 12:45:31 +0200
commit6971ce4134174b9772ed79ff7747696eab087d30 (patch)
treecda109375b048f9d67a7be0c5138a3c4b5900ca1 /sound
parenta158f2b79ff1948c864a38296ea4249f7296362b (diff)
parent29cf67b99527296e9c9b9f6995c1d271d21f79c0 (diff)
downloadlinux-6971ce4134174b9772ed79ff7747696eab087d30.tar.bz2
Merge tag 'asoc-v4.7-fix-hdac' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fix for v4.7 Fix an unused variable warning in the HDAC code.
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/hdac_hdmi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 37332976ccbb..181cd3bf0b92 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -1718,7 +1718,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
struct hdac_ext_device *edev = to_hda_ext_device(dev);
struct hdac_device *hdac = &edev->hdac;
struct hdac_bus *bus = hdac->bus;
- unsigned long timeout;
struct hdac_ext_bus *ebus = hbus_to_ebus(bus);
struct hdac_ext_link *hlink = NULL;
int err;