Merge tag 'devprop-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (a5a16050) · Commits · 戴 / test

Pull device properties framework fixes from Rafael Wysocki: "Fix the secondary firmware node handling while manipulating the primary firmware node for a given device (Andy Shevchenko)" * tag 'devprop-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: device property: Don't clear secondary pointer for shared primary firmware node device property: Keep secondary firmware node secondary by type

drivers/base/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -4264,6 +4264,7 @@ static inline bool fwnode_is_primary(struct fwnode_handle *fwnode)
		*/
		void set_primary_fwnode(struct device dev, struct fwnode_handle fwnode)
		{
		struct device *parent = dev->parent;
		struct fwnode_handle *fn = dev->fwnode;

		if (fwnode) {
		@@ -4278,7 +4279,8 @@ void set_primary_fwnode(struct device dev, struct fwnode_handle fwnode)
		} else {
		if (fwnode_is_primary(fn)) {
		dev->fwnode = fn->secondary;
		fn->secondary = NULL;
		if (!(parent && fn == parent->fwnode))
		fn->secondary = ERR_PTR(-ENODEV);
		} else {
		dev->fwnode = NULL;
		}

Admin message