From patchwork Thu Aug 1 21:33:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11071363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86D00746 for ; Thu, 1 Aug 2019 21:33:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C562285E5 for ; Thu, 1 Aug 2019 21:33:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F1672871C; Thu, 1 Aug 2019 21:33:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA813285E5 for ; Thu, 1 Aug 2019 21:33:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730522AbfHAVdd (ORCPT ); Thu, 1 Aug 2019 17:33:33 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:39103 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728045AbfHAVdd (ORCPT ); Thu, 1 Aug 2019 17:33:33 -0400 Received: by mail-pf1-f194.google.com with SMTP id f17so30806856pfn.6 for ; Thu, 01 Aug 2019 14:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RWmARDo48Z8Dv81pG22MrnEPvg/7991SYFzMS48qKnE=; b=cyRZJ1yRaVu6PJnIyZ0m2XF/aeI4KSucQmlgOYSbGhPKcG5yUcoM8+RdJ8DbmCDMnc RkHD86VRMuw7CevSp88Ee4Ezex7hFoeV3tSzVJFbBo0dyrpIsh0i+pZZIPAhDK8CzAxX UpJhLcrmpqLJsBs7zYMLqfQrw6B4tik6LogGI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RWmARDo48Z8Dv81pG22MrnEPvg/7991SYFzMS48qKnE=; b=sihVCq3BCORJqm/MtjTtMHEdtkRuYzm6E8VtcZPg+LpJOPJKALDixeNoz62kwx2CvA xvVtwiS/qlT8bO2iQSsFS2Bga3bRSyfLILbatGEwDJqm0D+PLp/e5jMrVXiDDHrQeubT QcljZqv1HpjaXxqJPcNvfh8EcycezvYl7kM+To89+OhSPBEWSuKBI+RutGyMMKiclrH6 T2wdIceCILpF5W7AINNRUIMweFW3+uiIBf0ZQoHqZH2j0bTU1T1iiSpXL7F/t9PFpxsa QAocTD4RTF2qjEBMsf3d1hdHaofXQ+oFuhBKSOP9LS+pr9FDi8ewr+3/tFQ/igvyppgB 0IZw== X-Gm-Message-State: APjAAAWi/9H8dVniztGLVDaoMa47+i4vfjXBeBY/5PZDukaZ53fCppxv IjPnVduVSB0hw2beZMEB1Anbmw== X-Google-Smtp-Source: APXvYqwYyiNdtpaoJsKsetkRz6ay7LYTZwzMZKhXzzcDkAft5BnXgQ6QvVK/JsDun15uuAKQ3FIRiw== X-Received: by 2002:a63:5945:: with SMTP id j5mr120457107pgm.452.1564695212134; Thu, 01 Aug 2019 14:33:32 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:fa53:7765:582b:82b9]) by smtp.gmail.com with ESMTPSA id v138sm83854994pfc.15.2019.08.01.14.33.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 14:33:31 -0700 (PDT) From: Stephen Boyd To: Sebastian Reichel Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, kernel-team@android.com, Greg Kroah-Hartman , Tri Vo , Kalesh Singh , Ravi Chandra Sadineni , "Rafael J. Wysocki" , Viresh Kumar Subject: [PATCH] power: supply: Init device wakeup after device_add() Date: Thu, 1 Aug 2019 14:33:30 -0700 Message-Id: <20190801213330.81079-1-swboyd@chromium.org> X-Mailer: git-send-email 2.22.0.770.g0f2c4a37fd-goog MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: "Rafael J. Wysocki" Cc: Viresh Kumar Signed-off-by: Stephen Boyd Acked-by: Rafael J. Wysocki --- See this thread[1] for more information on how this will be necessary. [1] https://lkml.kernel.org/r/20190731215514.212215-1-trong@android.com 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 82e84801264c..5c36c430ce8b 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -1051,14 +1051,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; @@ -1101,8 +1101,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);