summaryrefslogtreecommitdiffstats
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-08-11 09:40:16 +0200
committerTakashi Iwai <tiwai@suse.de>2015-08-11 09:40:16 +0200
commit41450b1b5ba101bf470b4fdf0407b30696e86bd3 (patch)
tree6d42fc8d3afc7770d8cc0c64ad92fd0835a82c1f /sound/hda
parentfe14f39e88c8ac16d0a051f8444a2294f8cb358c (diff)
parent6ac7ada210a8d23a56fbf18b6e1e00528844565c (diff)
downloadlinux-stable-41450b1b5ba101bf470b4fdf0407b30696e86bd3.tar.gz
linux-stable-41450b1b5ba101bf470b4fdf0407b30696e86bd3.tar.bz2
linux-stable-41450b1b5ba101bf470b4fdf0407b30696e86bd3.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/ext/hdac_ext_controller.c6
-rw-r--r--sound/hda/ext/hdac_ext_stream.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/sound/hda/ext/hdac_ext_controller.c b/sound/hda/ext/hdac_ext_controller.c
index b2da19b60f4e..358f16195483 100644
--- a/sound/hda/ext/hdac_ext_controller.c
+++ b/sound/hda/ext/hdac_ext_controller.c
@@ -44,16 +44,10 @@ int snd_hdac_ext_bus_parse_capabilities(struct hdac_ext_bus *ebus)
offset = snd_hdac_chip_readl(bus, LLCH);
- if (offset < 0)
- return -EIO;
-
/* Lets walk the linked capabilities list */
do {
cur_cap = _snd_hdac_chip_read(l, bus, offset);
- if (cur_cap < 0)
- return -EIO;
-
dev_dbg(bus->dev, "Capability version: 0x%x\n",
((cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF));
diff --git a/sound/hda/ext/hdac_ext_stream.c b/sound/hda/ext/hdac_ext_stream.c
index f8ffbdbb450d..3de47dd1a76d 100644
--- a/sound/hda/ext/hdac_ext_stream.c
+++ b/sound/hda/ext/hdac_ext_stream.c
@@ -299,7 +299,7 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus,
if (stream->direction != substream->stream)
continue;
- if (stream->opened) {
+ if (!stream->opened) {
if (!hstream->decoupled)
snd_hdac_ext_stream_decouple(ebus, hstream, true);
res = hstream;