From patchwork Tue Jan 28 14:05:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232483 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 108F7C2D0DB for ; Tue, 28 Jan 2020 14:42:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8556207FD for ; Tue, 28 Jan 2020 14:42:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580222574; bh=es7HLcpKCXWf+p55CQUrnopNhUvUT/K2ekvbyDPjqAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HjST54XWPG/GuqEyg3/6s/97moMtcxFgf0PbZdkIbXfzVHZwd3hO6WvzNMTlnC1rU 9u/zNyUB10DPgkN3/IdgYGc9gp+dhIFv2rYPO4TyvG0K1BL8MLpk0DxLDNG0VY7bGj RiUrXOhnYMghvdWY0jHgcI2AOWiCdp/JTAeY30EA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729460AbgA1OMY (ORCPT ); Tue, 28 Jan 2020 09:12:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:33606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729449AbgA1OMV (ORCPT ); Tue, 28 Jan 2020 09:12:21 -0500 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 8BFEB24688; Tue, 28 Jan 2020 14:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220741; bh=es7HLcpKCXWf+p55CQUrnopNhUvUT/K2ekvbyDPjqAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o/pOaY87CDsFSafrq0OECQ5BzDvg4jak6JnOABiki081Xiow9UAdtEbajjGj5vA5z 4LS1A6s+9sEV4pDiwPSFPWv3Zsd2AG8cQwTQiN27jpmoHunsMaJqI3gwaRK/ASF6vm vpeBph9jNU+fpEwud6WmG+FJgwwiCQjmjZS5EtWo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tri Vo , Kalesh Singh , Ravi Chandra Sadineni , Viresh Kumar , Stephen Boyd , "Rafael J. Wysocki" , Sebastian Reichel , Sasha Levin Subject: [PATCH 4.4 129/183] power: supply: Init device wakeup after device_add() Date: Tue, 28 Jan 2020 15:05:48 +0100 Message-Id: <20200128135842.749750195@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Boyd [ Upstream commit 8288022284859acbcc3cf1a073a1e2692d6c2543 ] We may want to use the device pointer in device_init_wakeup() with functions that expect the device to already be added with device_add(). For example, if we were to link the device initializing wakeup to something in sysfs such as a class for wakeups we'll run into an error. It looks like this code was written with the assumption that the device would be added before initializing wakeup due to the order of operations in power_supply_unregister(). Let's change the order of operations so we don't run into problems here. Fixes: 948dcf966228 ("power_supply: Prevent suspend until power supply events are processed") Cc: Greg Kroah-Hartman Cc: Tri Vo Cc: Kalesh Singh Cc: Ravi Chandra Sadineni Cc: Viresh Kumar Signed-off-by: Stephen Boyd Acked-by: Rafael J. Wysocki Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index b13cd074c52af..9281e42c9ed56 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -755,14 +755,14 @@ __power_supply_register(struct device *parent, } spin_lock_init(&psy->changed_lock); - rc = device_init_wakeup(dev, ws); - if (rc) - goto wakeup_init_failed; - rc = device_add(dev); if (rc) goto device_add_failed; + rc = device_init_wakeup(dev, ws); + if (rc) + goto wakeup_init_failed; + rc = psy_register_thermal(psy); if (rc) goto register_thermal_failed; @@ -798,8 +798,8 @@ register_cooler_failed: psy_unregister_thermal(psy); register_thermal_failed: device_del(dev); -device_add_failed: wakeup_init_failed: +device_add_failed: check_supplies_failed: dev_set_name_failed: put_device(dev);