[PATCH 4.7 102/141] ASoC: Intel: Skylake: Fix error return code in skl_probe()

From: Greg Kroah-Hartman
Date: Thu Oct 06 2016 - 04:44:19 EST


4.7-stable review patch. If anyone has any objections, please let me know.

------------------

From: Wei Yongjun <weiyj.lk@xxxxxxxxx>

commit 979cf59acc9d634cc140aadd0d2915947ab303cc upstream.

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@xxxxxxxxx>
Acked-By: Vinod Koul <vinod.kou@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
sound/soc/intel/skylake/skl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -659,8 +659,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);