4.4-stable patches

added patches:
	revert-device-property-keep-secondary-firmware-node-secondary-by-type.patch

diff --git a/queue-4.4/revert-device-property-keep-secondary-firmware-node-secondary-by-type.patch b/queue-4.4/revert-device-property-keep-secondary-firmware-node-secondary-by-type.patch
new file mode 100644 (file)
index 0000000..e6162a3
--- /dev/null
+++ b/queue-4.4/revert-device-property-keep-secondary-firmware-node-secondary-by-type.patch
@@ -0,0 +1,40 @@
+From 47f4469970d8861bc06d2d4d45ac8200ff07c693 Mon Sep 17 00:00:00 2001
+From: Bard Liao <yung-chuan.liao@linux.intel.com>
+Date: Tue, 5 Jan 2021 17:11:45 +0800
+Subject: Revert "device property: Keep secondary firmware node secondary by type"
+
+From: Bard Liao <yung-chuan.liao@linux.intel.com>
+
+commit 47f4469970d8861bc06d2d4d45ac8200ff07c693 upstream.
+
+While commit d5dcce0c414f ("device property: Keep secondary firmware
+node secondary by type") describes everything correct in its commit
+message, the change it made does the opposite and original commit
+c15e1bdda436 ("device property: Fix the secondary firmware node handling
+in set_primary_fwnode()") was fully correct.
+
+Revert the former one here and improve documentation in the next patch.
+
+Fixes: d5dcce0c414f ("device property: Keep secondary firmware node secondary by type")
+Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
+Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+Cc: 5.10+ <stable@vger.kernel.org> # 5.10+
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/base/core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/base/core.c
++++ b/drivers/base/core.c
+@@ -2357,7 +2357,7 @@ void set_primary_fwnode(struct device *d
+               if (fwnode_is_primary(fn)) {
+                       dev->fwnode = fn->secondary;
+                       if (!(parent && fn == parent->fwnode))
+-                              fn->secondary = ERR_PTR(-ENODEV);
++                              fn->secondary = NULL;
+               } else {
+                       dev->fwnode = NULL;
+               }

diff --git a/queue-4.4/series b/queue-4.4/series
index aa908adb9512c9d658cce9532bf2870d86d0c8f8..83173e57e9c2b45ceff0caf3dd9d9ea69604874b 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -32,3 +32,4 @@ usb-gadget-configfs-preserve-function-ordering-after-bind-failure.patch
 usb-serial-keyspan_pda-remove-unused-variable.patch
 x86-mm-fix-leak-of-pmd-ptlock.patch
 alsa-hda-conexant-add-a-new-hda-codec-cx11970.patch
+revert-device-property-keep-secondary-firmware-node-secondary-by-type.patch

diff --git a/queue-4.4/usb-serial-keyspan_pda-remove-unused-variable.patch b/queue-4.4/usb-serial-keyspan_pda-remove-unused-variable.patch
index f12bc042d72630575b86c2428fda33b2751443d4..bc936bf32f8b4e4e3e6894f4283bffb72f1bfc6a 100644 (file)
--- a/queue-4.4/usb-serial-keyspan_pda-remove-unused-variable.patch
+++ b/queue-4.4/usb-serial-keyspan_pda-remove-unused-variable.patch
@@ -1,7 +1,7 @@
 From 62218024401fac7dd7c7a6e74b566164d515d922 Mon Sep 17 00:00:00 2001
 From: Johan Hovold <johan@kernel.org>
 Date: Fri, 8 Jan 2021 15:55:28 +0100
-Subject: [PATCH] USB: serial: keyspan_pda: remove unused variable
+Subject: USB: serial: keyspan_pda: remove unused variable
 
 From: Johan Hovold <johan@kernel.org>