From: Sasha Levin <sashal@kernel.org>
Date: Wed, 24 Jun 2020 00:54:52 +0000 (-0400)
Subject: Drop soundwire-slave-don-t-init-debugfs-on-device-registr.patch from
X-Git-Tag: v5.7.6~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=468ad27180f5f44cdcf9c2d0724dd45609d03d90;p=thirdparty%2Fkernel%2Fstable-queue.git

Drop soundwire-slave-don-t-init-debugfs-on-device-registr.patch from
4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.19/series b/queue-4.19/series
index 61bb000af41..0012610f104 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -61,7 +61,6 @@ s390-qdio-put-thinint-indicator-after-early-error.patch
 tty-hvc-fix-data-abort-due-to-race-in-hvc_open.patch
 slimbus-ngd-get-drvdata-from-correct-device.patch
 thermal-drivers-ti-soc-thermal-avoid-dereferencing-e.patch
-soundwire-slave-don-t-init-debugfs-on-device-registr.patch
 usb-dwc3-gadget-properly-handle-failed-kick_transfer.patch
 staging-sm750fb-add-missing-case-while-setting-fb_vi.patch
 pci-v3-semi-fix-a-memory-leak-in-v3_pci_probe-error-.patch
diff --git a/queue-4.19/soundwire-slave-don-t-init-debugfs-on-device-registr.patch b/queue-4.19/soundwire-slave-don-t-init-debugfs-on-device-registr.patch
deleted file mode 100644
index a05497ce521..00000000000
--- a/queue-4.19/soundwire-slave-don-t-init-debugfs-on-device-registr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c0e88dd8621ce8c25b505eb4053e86a09a4adc9d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 20 Apr 2020 02:51:15 +0800
-Subject: soundwire: slave: don't init debugfs on device registration error
-
-From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-
-[ Upstream commit 8893ab5e8ee5d7c12e0fc1dca4a309475064473d ]
-
-The error handling flow seems incorrect, there is no reason to try and
-add debugfs support if the device registration did not
-succeed. Return on error.
-
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
-Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
-Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
-Link: https://lore.kernel.org/r/20200419185117.4233-2-yung-chuan.liao@linux.intel.com
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soundwire/slave.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
-index ac103bd0c1760..b6330b6672d59 100644
---- a/drivers/soundwire/slave.c
-+++ b/drivers/soundwire/slave.c
-@@ -55,6 +55,8 @@ static int sdw_slave_add(struct sdw_bus *bus,
- 		list_del(&slave->node);
- 		mutex_unlock(&bus->bus_lock);
- 		put_device(&slave->dev);
-+
-+		return ret;
- 	}
- 
- 	return ret;
--- 
-2.25.1
-