* [PATCH] net: rfkill: gpio: Add check for clk_enable()
@ 2024-11-07 21:01 Mingwei Zheng
2024-11-07 21:13 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Mingwei Zheng @ 2024-11-07 21:01 UTC (permalink / raw)
To: johannes, linville, rklein
Cc: linux-wireless, linux-kernel, Mingwei Zheng, Jiasheng Jiang
Add check for the return value of clk_enable() to catch the potential
expection.
Fixes: 7176ba23f8b5 ("net: rfkill: add generic gpio rfkill driver")
Signed-off-by: Mingwei Zheng <zmw12306@gmail.com>
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
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 c268c2b011f4..a87bb99231a6 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -31,9 +31,13 @@ struct rfkill_gpio_data {
static int rfkill_gpio_set_power(void *data, bool blocked)
{
struct rfkill_gpio_data *rfkill = data;
+ int ret;
- if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
- clk_enable(rfkill->clk);
+ if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled) {
+ 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.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] net: rfkill: gpio: Add check for clk_enable()
@ 2024-11-08 18:55 Mingwei Zheng
0 siblings, 0 replies; 3+ messages in thread
From: Mingwei Zheng @ 2024-11-08 18:55 UTC (permalink / raw)
To: johannes
Cc: linville, rklein, linux-wireless, linux-kernel, Mingwei Zheng,
Jiasheng Jiang
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 <zmw12306@gmail.com>
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
Changelog:
v2 -> v3
1. Move int ret declaration into if.
2. Replace if (!ret) with if (ret).
---
Changelog:
v1 -> v2
1. Replace expection with error in commit msg.
---
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 c268c2b011f4..a8e21060112f 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.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-08 18:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-07 21:01 [PATCH] net: rfkill: gpio: Add check for clk_enable() Mingwei Zheng
2024-11-07 21:13 ` Johannes Berg
2024-11-08 18:55 Mingwei Zheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®