Skip to contentSkip to conversation

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

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.4-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.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 979cf59acc9d634cc140aadd0d2915947ab303cc Mon Sep 17 00:00:00 2001

From: Wei Yongjun <[email protected]>
Date: Fri, 12 Aug 2016 11:45:18 +0000
Subject: ASoC: Intel: Skylake: Fix error return code in skl_probe()

From: Wei Yongjun <[email protected]>

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")
---
 sound/soc/intel/skylake/skl.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl.c +3 -1
@@ -464,8 +464,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;
+	}
 
 	pci_set_drvdata(skl->pci, ebus);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/asoc-intel-skylake-fix-error-return-code-in-skl_probe.patch