From dfaca803ef0ca6a48b7007f1e90e8c18dc99b784 Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Fri, 20 Mar 2020 13:25:43 -0700 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/base/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 99ebea71cd7c..1cc4e5ebe3c4 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -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;