Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d517fec authored by Saravana Kannan's avatar Saravana Kannan
Browse files

UPSTREAM: driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links 



Commit 21c27f06587d ("driver core: Fix SYNC_STATE_ONLY device link
implementation") didn't completely fix STATELESS + SYNC_STATE_ONLY
handling.

What looks like an optimization in that commit is actually a bug that
causes an if condition to always take the else path. This prevents
reordering of devices in the dpm_list when a DL_FLAG_STATELESS device
link is create on top of an existing DL_FLAG_SYNC_STATE_ONLY device
link.

Fixes: 21c27f06587d ("driver core: Fix SYNC_STATE_ONLY device link implementation")
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Cc: stable <stable@vger.kernel.org>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20200520043626.181820-1-saravanak@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 44e960490ddf868fc9135151c4a658936e771dc2)
Bug: 157103558
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Change-Id: I6cd908eb4b29b1058018bfb906cb508fb3ca710f
parent d122e95d

drivers/base/core.c

+5 −3
Original line number Diff line number Diff line
@@ -347,13 +347,15 @@ struct device_link *device_link_add(struct device *consumer, 


		if (flags & DL_FLAG_STATELESS) {

			kref_get(&link->kref);

			link->flags |= DL_FLAG_STATELESS;

			if (link->flags & DL_FLAG_SYNC_STATE_ONLY &&

			    !(link->flags & DL_FLAG_STATELESS))

			    !(link->flags & DL_FLAG_STATELESS)) {

				link->flags |= DL_FLAG_STATELESS;

				goto reorder;

			else

			} else {

				link->flags |= DL_FLAG_STATELESS;

				goto out;

			}

		}



		/*

		 * If the life time of the link following from the new flags is