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=ham 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 18B5BC07E9C for ; Sat, 10 Jul 2021 23:58:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF4D56135E for ; Sat, 10 Jul 2021 23:58:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234163AbhGKAAz (ORCPT ); Sat, 10 Jul 2021 20:00:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:48486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231922AbhGJX62 (ORCPT ); Sat, 10 Jul 2021 19:58:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 11522613E3; Sat, 10 Jul 2021 23:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625961185; bh=l2ZY/OygMY7GtzSUBEg80RiwOHk+3ZXdv5CwlpCv/5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B7Klw6dFIS56dMehJTL6Y3n2W28bkeqtDQ4XVqx95Gf0035TBL1NLQhDA/P7nBmc5 JvERz5mVc0qEwMppdqqzsZkW34IHHuIYK8+q+P1R7zlXUsGVXFxHjAuURzFvPVDb6q BJFHemc0D2s8PKoCL4VJ5lTucyF1l/HlGZvtdhZH33Y3xExtPzUt0w5XFKyXi1g0o5 BUr6/33enqxgFrrw3kI4VvuwGPV0qfkWNMOU4pabEERUa/jzv7FngcLCD5I6XpZfwr P0BqL7tvF9WEfPhanvdM1cMR/wnSU75s/0mHOmMrbsV5hguoZrlQ4Ln9viALbAqUDy TGhMJBbmR+Z9Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Linus Walleij , Sebastian Reichel , Sasha Levin Subject: [PATCH AUTOSEL 4.4 02/12] power: supply: ab8500: Avoid NULL pointers Date: Sat, 10 Jul 2021 19:52:52 -0400 Message-Id: <20210710235302.3222809-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210710235302.3222809-1-sashal@kernel.org> References: <20210710235302.3222809-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/ab8500_charger.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index e388171f4e58..98724c3a28e5 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -409,6 +409,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 && @@ -435,7 +443,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