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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 6D627C33CAF for ; Thu, 16 Jan 2020 18:43:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4089C2081E for ; Thu, 16 Jan 2020 18:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579200231; bh=YUoZyX6P5M0BCnBJRl5x8rurwys2tcaoje5mSFIVESc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WQXgCHzPuHRk0rtMy/AOG5CuX5JaAtqjJuEJ9CaVpRvMNwvVcyBfu4jcyyErxbFyL GwR8hSEZ36pLhBb1LZkfztxOOZcbbPsGGfqrHykhAqLwrJzcHWnMI/ROT8jAApiFWB oHOQDTYYBb3eFs0Mo62eqnmf6eaH7u9ZynwzmGZM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389440AbgAPRLI (ORCPT ); Thu, 16 Jan 2020 12:11:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:51040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390158AbgAPRLI (ORCPT ); Thu, 16 Jan 2020 12:11:08 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7515D2468A; Thu, 16 Jan 2020 17:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194667; bh=YUoZyX6P5M0BCnBJRl5x8rurwys2tcaoje5mSFIVESc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSvcvOGlu7k4t3LSiBH4Jg5WrbCkXyndMRXo+CfjbDMl+QJ4sFnX0PIpIG7/Au6j1 kuo3jrKFyNi7iVM0ESeyDZ6cA2r0YAjlBi3Mf9wqLFIUc5r5qBVU02etP4Gqmw0Zeb LLTuQADKbNXlinKCvxOpOXUiOF33gA6+U697r8aE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephen Boyd , Greg Kroah-Hartman , Tri Vo , Kalesh Singh , Ravi Chandra Sadineni , Viresh Kumar , "Rafael J . Wysocki" , Sebastian Reichel , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 516/671] power: supply: Init device wakeup after device_add() Date: Thu, 16 Jan 2020 12:02:34 -0500 Message-Id: <20200116170509.12787-253-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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/supply/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index e85361878450..e43a7b3b570c 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -902,14 +902,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; @@ -946,8 +946,8 @@ __power_supply_register(struct device *parent, 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); -- 2.20.1