From: Lukas Wunner Date: Sat, 10 Feb 2018 18:13:58 +0000 (+0100) Subject: PM / runtime: Update links_count also if !CONFIG_SRCU X-Git-Tag: v4.16-rc2~20^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=433986c2c265d106d6a8e88006e0131fefc92b7b;p=thirdparty%2Fkernel%2Flinux.git PM / runtime: Update links_count also if !CONFIG_SRCU Commit baa8809f6097 (PM / runtime: Optimize the use of device links) added an invocation of pm_runtime_drop_link() to __device_link_del(). However there are two variants of that function, one for CONFIG_SRCU and another for !CONFIG_SRCU, and the commit only modified the former. Fixes: baa8809f6097 (PM / runtime: Optimize the use of device links) Cc: v4.10+ # v4.10+ Signed-off-by: Lukas Wunner Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/base/core.c b/drivers/base/core.c index b2261f92f2f1c..5847364f25d96 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -310,6 +310,9 @@ static void __device_link_del(struct device_link *link) dev_info(link->consumer, "Dropping the link to %s\n", dev_name(link->supplier)); + if (link->flags & DL_FLAG_PM_RUNTIME) + pm_runtime_drop_link(link->consumer); + list_del(&link->s_node); list_del(&link->c_node); device_link_free(link);