Patch "ASoC: Intel: Skylake: Fix error return code in skl_probe()" has been added to the 4.7-stable tree

Patch "ASoC: Intel: Skylake: Fix error return code in skl_probe()" has been added to the 4.7-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ASoC: Intel: Skylake: Fix error return code in skl_probe()

to the 4.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     asoc-intel-skylake-fix-error-return-code-in-skl_probe.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 979cf59acc9d634cc140aadd0d2915947ab303cc Mon Sep 17 00:00:00 2001
From: Wei Yongjun <weiyj.lk@gmail.com>
Date: Fri, 12 Aug 2016 11:45:18 +0000
Subject: ASoC: Intel: Skylake: Fix error return code in skl_probe()

From: Wei Yongjun <weiyj.lk@gmail.com>

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@gmail.com>
Acked-By: Vinod Koul <vinod.kou@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 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);
 


Patches currently in stable-queue which might be from weiyj.lk@gmail.com are

queue-4.7/asoc-intel-skylake-fix-error-return-code-in-skl_probe.patch
queue-4.7/ib-core-fix-possible-memory-leak-in-cma_resolve_iboe_route.patch