summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-08-12 11:45:18 +0000
committerMark Brown <broonie@kernel.org>2016-08-12 13:29:12 +0100
commit979cf59acc9d634cc140aadd0d2915947ab303cc (patch)
tree0ed6a79da70d7601edef19c14b39501d164eaa2a /sound
parent2392f7fd695246df4fb5f0b5fb88ce37cdb01764 (diff)
downloadlinux-979cf59acc9d634cc140aadd0d2915947ab303cc.tar.gz
linux-979cf59acc9d634cc140aadd0d2915947ab303cc.tar.bz2
linux-979cf59acc9d634cc140aadd0d2915947ab303cc.zip
ASoC: Intel: Skylake: Fix error return code in skl_probe()
Fix to return error code -ENODEV from the error handling case instead of 0, as done elsewhere in this function. Fixes: 87b2bdf02278 ("ASoC: Intel: Skylake: Initialize NHLT table") Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Acked-By: Vinod Koul <vinod.kou@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/skylake/skl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index cd59536a761d..e3e764167765 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -672,8 +672,10 @@ static int skl_probe(struct pci_dev *pci,
skl->nhlt = skl_nhlt_init(bus->dev);
- if (skl->nhlt == NULL)
+ if (skl->nhlt == NULL) {
+ err = -ENODEV;
goto out_free;
+ }
skl_nhlt_update_topology_bin(skl);