Commit dfaca803 authored Mar 20, 2020 by Saravana Kannan Committed by Greg Kroah-Hartman Mar 21, 2020

ANDROID: Conflict fix for merging 4.19.112



This fixes the merge issue with 515db266a9da ("driver core: Remove
device link creation limitation")

Change-Id: I848f7ad9ee63aaef74c78488ffd57a751f28a795
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parent 417d28a4

drivers/base/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -682,7 +682,7 @@ static void __device_links_queue_sync_state(struct device *dev,
		return;

		list_for_each_entry(link, &dev->links.consumers, s_node) {
		if (link->flags & DL_FLAG_STATELESS)
		if (!(link->flags & DL_FLAG_MANAGED))
		continue;
		if (link->status != DL_STATE_ACTIVE)
		return;