From patchwork Mon Jul 19 14:52:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 479964 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4249205jao; Mon, 19 Jul 2021 08:47:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdEpN1WuXPBv+SWYK47xUSUCxvEN5o47oeDsUWCr7SMmH+uz+jOH12nQhd3/8lnnGStUdN X-Received: by 2002:a05:6402:5209:: with SMTP id s9mr26040233edd.92.1626709622503; Mon, 19 Jul 2021 08:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709622; cv=none; d=google.com; s=arc-20160816; b=Uu1zAImJ9ht9jRocuhJbOVZTV7p61mDkavq/MlldhXzLRARdMIvFkQ/jYXTCMbuc97 3nuQzwo/iHd0QKKXYFsbvUCDMxgETeNICdeuF9hzS9yf+tO7s80yWC3pirUKBym7de6H gDJkCJSJMrX0Zh57ObKZWuE/yYPca+Na6YHCsD4TjU+zPfK1x/9ic9mBlrPAsmGNVoqm qKldMWvO4S1i5Dv+VcBss/uAtTnrikPpEZ07Kxwg85h2Jjmd/kM1VF2lKMXCB6/slI1k vXFffqb9QJ7Re0Gyx8asUk6Az5QuIwMSctzJzAPTHkMdK99yfBZVstVEaaQN9snaJpRG rrLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yiRp/U+bYIvN3g1eJjyC2NFHtlFyqPlTw5aky6R60Ec=; b=ZV+tHj0Fz26+/oZ7vP5XYCsbGAAzfctbkN0T3kfPbo66KWMkCkwaRGN0iqKtzBkTUI JBWBuG0vSH+Lvf7pIJ141QAwJSGT1MPB7+rAhed+4qSb1nAPq2yBdhhUR5VU2l6xeqN3 XaNpqCsODfEZhPfm6fLHnUdKc48eaf5RGuZKM/NnFoSBH5UysxNngFSoOdjsdHAwe+o8 rtQsPBr9YAd0XXi6mbVEwg5S8DA8dqaWG/zV591ofqAnMsDxx6bIMoMJAatD6vRmgdvx 8EtVEnwc7/TU5kDnsdkiREvTuWxF8garl3rb6t4ADSSVoLImYvODk7+wh67T56SrsIaY 4n7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jFvc2ma9; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z11si402714edb.95.2021.07.19.08.47.01; Mon, 19 Jul 2021 08:47:02 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jFvc2ma9; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344519AbhGSPGD (ORCPT + 12 others); Mon, 19 Jul 2021 11:06:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:32768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343544AbhGSPCw (ORCPT ); Mon, 19 Jul 2021 11:02:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 44A6761003; Mon, 19 Jul 2021 15:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709381; bh=04LlMv8rOHb58b6lvWv89DmumIl50y9zCL2ZpAa3RMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jFvc2ma96IBFuz3pW0o9o0/riavhQ+A7FP8vHEkAKqFbwTrA9R9MIKB4laZhAxtmt 4VwNZyQoGeoYLOnDwLelNM8j1KN18zmyMRuP9xtJjpxa+3uPVEQHYfNfQFesbo9A8V zBmd7JUFBexsmgOzEEO1gk+C5wAXJIjTrr2OVV94= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sebastian Reichel , Sasha Levin Subject: [PATCH 4.19 360/421] power: supply: ab8500: Avoid NULL pointers Date: Mon, 19 Jul 2021 16:52:51 +0200 Message-Id: <20210719144958.740213093@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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(-) -- 2.30.2 diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index 98b335042ba6..76b6c60cde80 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -407,6 +407,14 @@ disable_otp: 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 && @@ -433,7 +441,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);