From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 5 Nov 2020 16:27:16 +0000 (+0100)
Subject: 5.9-stable patches
X-Git-Tag: v5.9.6~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24d4a3698d9702076594e6202fab8c9e986ebee3;p=thirdparty%2Fkernel%2Fstable-queue.git

5.9-stable patches

added patches:
	asoc-sof-intel-hda-codec-move-unused-label-to-correct-position.patch
---

diff --git a/queue-5.9/asoc-sof-intel-hda-codec-move-unused-label-to-correct-position.patch b/queue-5.9/asoc-sof-intel-hda-codec-move-unused-label-to-correct-position.patch
new file mode 100644
index 00000000000..0520a6a2c75
--- /dev/null
+++ b/queue-5.9/asoc-sof-intel-hda-codec-move-unused-label-to-correct-position.patch
@@ -0,0 +1,40 @@
+From 11ec0edc6408a739dffca34ebbbe921817c3b10e Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Date: Thu, 13 Aug 2020 12:58:35 -0500
+Subject: ASOC: SOF: Intel: hda-codec: move unused label to correct position
+
+From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+
+commit 11ec0edc6408a739dffca34ebbbe921817c3b10e upstream.
+
+Cppcheck reports the following warning:
+
+sound/soc/sof/intel/hda-codec.c:191:1: style: Label 'error' is not
+used. [unusedLabel]
+
+This label is indeed only used conditionally, move it where it's
+actually used.
+
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20200813175839.59422-2-pierre-louis.bossart@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/sof/intel/hda-codec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sound/soc/sof/intel/hda-codec.c
++++ b/sound/soc/sof/intel/hda-codec.c
+@@ -178,6 +178,11 @@ static int hda_codec_probe(struct snd_so
+ 	}
+ 
+ 	return ret;
++
++error:
++	snd_hdac_ext_bus_device_exit(hdev);
++	return -ENOENT;
++
+ #else
+ 	hdev = devm_kzalloc(sdev->dev, sizeof(*hdev), GFP_KERNEL);
+ 	if (!hdev)
diff --git a/queue-5.9/series b/queue-5.9/series
index 5f351cce28b..d5dab697991 100644
--- a/queue-5.9/series
+++ b/queue-5.9/series
@@ -17,3 +17,4 @@ drm-i915-reject-90-270-degree-rotated-initial-fbs.patch
 drm-i915-restore-ilk-m-rps-support.patch
 drm-nouveau-kms-nv50-program-notifier-offset-before-requesting-disp-caps.patch
 drm-nouveau-device-fix-changing-endianess-code-to-work-on-older-gpus.patch
+asoc-sof-intel-hda-codec-move-unused-label-to-correct-position.patch