From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07CACC2D0EB for ; Wed, 25 Mar 2020 17:44:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB07D20777 for ; Wed, 25 Mar 2020 17:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585158271; bh=mISHSjoMsIZ+fxJ0QKRj3gwZ7fgFWGgkHXQgCsKxo5o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=AjAFCx0un43VL4rxWaTRmSj1tp3yjA+eBQAVETtqSmNsBBj1yy+FYG5QtzLxkUDmF Oh7SnUYCuZGuwzQJ09/GI/9nQwMsXC+HU5z+03ia+T6/IoaVdxaPr5ud60qrAECIew 980BpsXAz1MIWm9yS8BMIcTtbwoOenOG7PMqy11E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728158AbgCYRoa (ORCPT ); Wed, 25 Mar 2020 13:44:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:60892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727843AbgCYRoa (ORCPT ); Wed, 25 Mar 2020 13:44:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 67F8A20777; Wed, 25 Mar 2020 17:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585158269; bh=mISHSjoMsIZ+fxJ0QKRj3gwZ7fgFWGgkHXQgCsKxo5o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=I3Ea4zUMbkESFEf7+hBBwqkHO8YVxddfJ+/IOi7LkWOVyoD2XzKkGj1dI4WIp1DHA z5aM03RnyzWLZbNJGadWBpM/DM4TtqaGKfS0z2DQjZt/QuJ/7+d3hQpN8xz8pcvCc3 sR5dtKZkddb26d7cszp/nMnrd8Pn3mkn0yzeRZL4= Date: Wed, 25 Mar 2020 18:44:27 +0100 From: Greg KH To: linux-kernel@vger.kernel.org, Andrew Morton , torvalds@linux-foundation.org, stable@vger.kernel.org Cc: lwn@lwn.net, Jiri Slaby Subject: Re: Linux 5.5.13 Message-ID: <20200325174427.GB3764758@kroah.com> References: <20200325174421.GA3764758@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200325174421.GA3764758@kroah.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org diff --git a/Makefile b/Makefile index d962fe0f26ce..d1574c99f83c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = Kleptomaniac Octopus diff --git a/drivers/base/core.c b/drivers/base/core.c index 3306d5ae92a6..dbb0f9130f42 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -718,6 +718,8 @@ static void __device_links_queue_sync_state(struct device *dev, { struct device_link *link; + if (!dev_has_sync_state(dev)) + return; if (dev->state_synced) return; @@ -819,7 +821,7 @@ late_initcall(sync_state_resume_initcall); static void __device_links_supplier_defer_sync(struct device *sup) { - if (list_empty(&sup->links.defer_sync)) + if (list_empty(&sup->links.defer_sync) && dev_has_sync_state(sup)) list_add_tail(&sup->links.defer_sync, &deferred_sync); } diff --git a/include/linux/device.h b/include/linux/device.h index 96ff76731e93..50d97767d8d6 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1522,6 +1522,17 @@ static inline struct device_node *dev_of_node(struct device *dev) void driver_init(void); +static inline bool dev_has_sync_state(struct device *dev) +{ + if (!dev) + return false; + if (dev->driver && dev->driver->sync_state) + return true; + if (dev->bus && dev->bus->sync_state) + return true; + return false; +} + /* * High level routines for use by the bus drivers */