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 0CC061DAC9F; Tue, 3 Dec 2024 15:51:48 +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=1733241109; cv=none; b=nLwf832ipWkV3HeMai/6MH5suNZspr10ea8fYdDOxPZo36eXpbBf4P93WPLScSj9kciTz6drWRek6rBKLrEwghno8uvwvS8Q+7+haSmO/j47UnCt7I3a7nrCyELNKc8DPtV3GZALK2WPTZL2e/AeoRxq4SIWy/bwobDyuLoE1mc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733241109; c=relaxed/simple; bh=X3VUPu+PWyWQCy9LWqZM+WK//W/pJWpB0DUTzZO3KcU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZW0RaF7dvRNL7gmbnH1WavYig5aeCoVmbCImS8ubqC64ZlK6hCpZw0uDBdOhiXHjLULXYbgaZJZOpf2UNB4T0GkrMmgUbUKhwL2mSCtedY7WqriHDdfbq0UlS8uyCbUCtoJW8SAD/m8RYB1Y3CFgXe3TeLf/biIIyroQMsw+qXQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=faXq9oYn; 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="faXq9oYn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B3ABC4CECF; Tue, 3 Dec 2024 15:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733241108; bh=X3VUPu+PWyWQCy9LWqZM+WK//W/pJWpB0DUTzZO3KcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=faXq9oYnbHMzt64BpbbMiQ6U+PbeWqtLelLV2aqv0DFCcC4R75UwRbez9j1pp0K5B ALLLpGguJofhw07v2KbTmbshfWJcj/pz/+paENU5351d8L9duyC3Mj+JHVLQo5smc6 8/fTe0wcoO+4aLD8DyRUqAZ5v9TtSPfWX65qwyY0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mingwei Zheng , Jiasheng Jiang , Johannes Berg , Sasha Levin Subject: [PATCH 6.12 327/826] net: rfkill: gpio: Add check for clk_enable() Date: Tue, 3 Dec 2024 15:40:54 +0100 Message-ID: <20241203144756.517484333@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203144743.428732212@linuxfoundation.org> References: <20241203144743.428732212@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Mingwei Zheng [ Upstream commit 8251e7621b25ccdb689f1dd9553b8789e3745ea1 ] Add check for the return value of clk_enable() to catch the potential error. Fixes: 7176ba23f8b5 ("net: rfkill: add generic gpio rfkill driver") Signed-off-by: Mingwei Zheng Signed-off-by: Jiasheng Jiang Link: https://patch.msgid.link/20241108195341.1853080-1-zmw12306@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/rfkill/rfkill-gpio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index c268c2b011f42..a8e21060112ff 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -32,8 +32,12 @@ static int rfkill_gpio_set_power(void *data, bool blocked) { struct rfkill_gpio_data *rfkill = data; - if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled) - clk_enable(rfkill->clk); + if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled) { + int ret = clk_enable(rfkill->clk); + + if (ret) + return ret; + } gpiod_set_value_cansleep(rfkill->shutdown_gpio, !blocked); gpiod_set_value_cansleep(rfkill->reset_gpio, !blocked); -- 2.43.0