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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 95EEFC11F68 for ; Sat, 10 Jul 2021 23:49:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83AA260234 for ; Sat, 10 Jul 2021 23:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232443AbhGJXwU (ORCPT ); Sat, 10 Jul 2021 19:52:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:39078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232144AbhGJXwM (ORCPT ); Sat, 10 Jul 2021 19:52:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 314C6610CA; Sat, 10 Jul 2021 23:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625960966; bh=YnFRi7KtHvAihsOWnBN4FymFWdA2NxL3pkdq6831NgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DfUsd8HuhZId8MVn2jtRrHa4ItcY5bcBJogMD31iQcyQviYwBe5N3TCnRFBMWzy9k HBLJaBxcJ8W9kPezGjCeRQBkifz8UOEhjbsxlyxfdIFfLVSaXgy+uEmLepFq2krWwO e3ntzxVPFggCMTVEqZH9BYeyR6u5qLCXHVmoCa2+MEHTW5aPIj2TD1UmU+guU8Nibo LaUesac8NIQRG5TNL7ku/uJsFcEr03YYmBvyg99zcpG3moY39vUbigHUHMmyRn75UY MXwWnq13MetremhCPyveEe9x8B4tTz+vOfUQfoMO+ewSAyeGqPheuQgVN0nhVRYrU3 m2lmRQryrWlIA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Linus Walleij , Sebastian Reichel , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 06/43] power: supply: ab8500: Avoid NULL pointers Date: Sat, 10 Jul 2021 19:48:38 -0400 Message-Id: <20210710234915.3220342-6-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710234915.3220342-1-sashal@kernel.org> References: <20210710234915.3220342-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 5bcb5087c9dd3dca1ff0ebd8002c5313c9332b56 ] Sometimes the code will crash because we haven't enabled AC or USB charging and thus not created the corresponding psy device. Fix it by checking that it is there before notifying. Signed-off-by: Linus Walleij Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/ab8500_charger.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index ac77c8882d17..893185448284 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -413,6 +413,14 @@ static void ab8500_enable_disable_sw_fallback(struct ab8500_charger *di, static void ab8500_power_supply_changed(struct ab8500_charger *di, struct power_supply *psy) { + /* + * This happens if we get notifications or interrupts and + * the platform has been configured not to support one or + * other type of charging. + */ + if (!psy) + return; + if (di->autopower_cfg) { if (!di->usb.charger_connected && !di->ac.charger_connected && @@ -439,7 +447,15 @@ static void ab8500_charger_set_usb_connected(struct ab8500_charger *di, if (!connected) di->flags.vbus_drop_end = false; - sysfs_notify(&di->usb_chg.psy->dev.kobj, NULL, "present"); + /* + * Sometimes the platform is configured not to support + * USB charging and no psy has been created, but we still + * will get these notifications. + */ + if (di->usb_chg.psy) { + sysfs_notify(&di->usb_chg.psy->dev.kobj, NULL, + "present"); + } if (connected) { mutex_lock(&di->charger_attached_mutex); -- 2.30.2