From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3485313E13; Tue, 16 Dec 2025 11:24:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765884264; cv=none; b=qE4DHauyRavu47HK4mpazo/wlrLntVYWsGQayNuKyXx8201f6esq8g7bcv4KFuxTi49/AMCvjo18rjVTakIRiVZ+52TgoY6LktARdPzagK5H3seYLKzYnHOLMzwgsoyeZnw+ccm06BMEWs0wUriBOqhvFWpS9AIXQdTAfsWuu+k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765884264; c=relaxed/simple; bh=ojWLpQ83jMabkdQLt3S63K598NmSZL1k2qJUDdE66dY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WgLwc2Gh60q0kxaa2gDdtOAo0jYoPfdobg1Ib+qbLGf6ha1PCl9mvZmKvSvGuWm59XF9zj8rmhioljYoLyih+frjupmo6T3oQ4ExK7dwEU0zn2RLSfk1xEK0QbwotLQ2WiGaKtMX1Imq1Z2JhRNkwYhbtL4pIGM1z0DgOiYQyxk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gmuiSRvm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gmuiSRvm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE559C4CEF1; Tue, 16 Dec 2025 11:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765884264; bh=ojWLpQ83jMabkdQLt3S63K598NmSZL1k2qJUDdE66dY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gmuiSRvmnfWrKp4cJmpZ3nKSFoYTU3lzOcwTOEoTnf2oGswvLRtrrZbyQ4IZ3Z8QZ GGTnW2wx2VHlJr4pnuLBaWuP1sRtzhOLLRZOlqAS3N/5YhQ5/+nXl/nCMAwW+O51sB q6DfKaGT4F7SNqRQ/15DuBn6yw2LThNoEZmJRweM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ivan Abramov , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.12 108/354] power: supply: wm831x: Check wm831x_set_bits() return value Date: Tue, 16 Dec 2025 12:11:15 +0100 Message-ID: <20251216111324.832571577@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111320.896758933@linuxfoundation.org> References: <20251216111320.896758933@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ivan Abramov [ Upstream commit ea14bae6df18942bccb467fcf5ff33ca677b8253 ] Since wm831x_set_bits() may return error, log failure and exit from wm831x_usb_limit_change() in such case. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 626b6cd5f52e ("power: wm831x_power: Support USB charger current limit management") Signed-off-by: Ivan Abramov Link: https://patch.msgid.link/20251009170553.566561-1-i.abramov@mt-integration.ru Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/wm831x_power.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/power/supply/wm831x_power.c b/drivers/power/supply/wm831x_power.c index d56e499ac59fb..10f3ecf5af72f 100644 --- a/drivers/power/supply/wm831x_power.c +++ b/drivers/power/supply/wm831x_power.c @@ -144,6 +144,7 @@ static int wm831x_usb_limit_change(struct notifier_block *nb, struct wm831x_power, usb_notify); unsigned int i, best; + int ret; /* Find the highest supported limit */ best = 0; @@ -156,8 +157,13 @@ static int wm831x_usb_limit_change(struct notifier_block *nb, dev_dbg(wm831x_power->wm831x->dev, "Limiting USB current to %umA", wm831x_usb_limits[best]); - wm831x_set_bits(wm831x_power->wm831x, WM831X_POWER_STATE, - WM831X_USB_ILIM_MASK, best); + ret = wm831x_set_bits(wm831x_power->wm831x, WM831X_POWER_STATE, + WM831X_USB_ILIM_MASK, best); + if (ret < 0) { + dev_err(wm831x_power->wm831x->dev, + "Failed to set USB current limit: %d\n", ret); + return ret; + } return 0; } -- 2.51.0