shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: Conflict fix for merging 4.19.112

Browse Source 
This fixes the merge issue with 515db266a9 ("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>
This commit is contained in:
Saravana Kannan
2020-03-20 13:25:43 -07:00
committed by Greg Kroah-Hartman
parent 417d28a44d
commit dfaca803ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/core.c
View File

@@ -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;