From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
To: dmitry.torokhov@gmail.com, broonie@opensource.wolfsonmicro.com,
kgene.kim@samsung.com, kyungmin.park@samsung.com,
jy0922.shim@samsung.com, vkoul@kernel.org, arnd@arndb.de,
nikita.shubin@maquefel.me, hartleys@visionengravers.com,
christophe.jaillet@wanadoo.fr, shiraz.linux.kernel@gmail.com,
rajeev-dlh.kumar@st.com
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiasheng Jiang <jiashengjiangcool@gmail.com>
Subject: [PATCH] Input: samsung-keypad - Add check for clk_enable()
Date: Mon, 11 Nov 2024 20:20:05 +0000 [thread overview]
Message-ID: <20241111202006.6669-2-jiashengjiangcool@gmail.com> (raw)
In-Reply-To: <20241111202006.6669-1-jiashengjiangcool@gmail.com>
Add check for the return value of clk_enable() in order to catch the
potential exception.
Moreover, recursively convert the return type of samsung_keypad_start()
and samsung_keypad_toggle_wakeup() into int and check their return values.
Fixes: 48c98b1bb85a ("Input: samsung-keypad - implement runtime power management support")
Fixes: 0fffed27f92d ("Input: samsung-keypad - Add samsung keypad driver")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
drivers/input/keyboard/samsung-keypad.c | 43 +++++++++++++++++--------
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index e212eff7687c..f9bbd4e9d031 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -169,16 +169,19 @@ static irqreturn_t samsung_keypad_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static void samsung_keypad_start(struct samsung_keypad *keypad)
+static int samsung_keypad_start(struct samsung_keypad *keypad)
{
unsigned int val;
+ int ret;
pm_runtime_get_sync(&keypad->pdev->dev);
/* Tell IRQ thread that it may poll the device. */
keypad->stopped = false;
- clk_enable(keypad->clk);
+ ret = clk_enable(keypad->clk);
+ if (ret)
+ return ret;
/* Enable interrupt bits. */
val = readl(keypad->base + SAMSUNG_KEYIFCON);
@@ -189,6 +192,8 @@ static void samsung_keypad_start(struct samsung_keypad *keypad)
writel(0, keypad->base + SAMSUNG_KEYIFCOL);
pm_runtime_put(&keypad->pdev->dev);
+
+ return 0;
}
static void samsung_keypad_stop(struct samsung_keypad *keypad)
@@ -225,9 +230,7 @@ static int samsung_keypad_open(struct input_dev *input_dev)
{
struct samsung_keypad *keypad = input_get_drvdata(input_dev);
- samsung_keypad_start(keypad);
-
- return 0;
+ return samsung_keypad_start(keypad);
}
static void samsung_keypad_close(struct input_dev *input_dev)
@@ -484,11 +487,14 @@ static int samsung_keypad_runtime_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct samsung_keypad *keypad = platform_get_drvdata(pdev);
unsigned int val;
+ int ret;
if (keypad->stopped)
return 0;
- clk_enable(keypad->clk);
+ ret = clk_enable(keypad->clk);
+ if (ret)
+ return ret;
val = readl(keypad->base + SAMSUNG_KEYIFCON);
val &= ~SAMSUNG_KEYIFCON_WAKEUPEN;
@@ -500,12 +506,15 @@ static int samsung_keypad_runtime_resume(struct device *dev)
return 0;
}
-static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,
+static int samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,
bool enable)
{
unsigned int val;
+ int ret;
- clk_enable(keypad->clk);
+ ret = clk_enable(keypad->clk);
+ if (ret)
+ return ret;
val = readl(keypad->base + SAMSUNG_KEYIFCON);
if (enable) {
@@ -520,6 +529,8 @@ static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,
writel(val, keypad->base + SAMSUNG_KEYIFCON);
clk_disable(keypad->clk);
+
+ return 0;
}
static int samsung_keypad_suspend(struct device *dev)
@@ -527,17 +538,18 @@ static int samsung_keypad_suspend(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct samsung_keypad *keypad = platform_get_drvdata(pdev);
struct input_dev *input_dev = keypad->input_dev;
+ int ret;
mutex_lock(&input_dev->mutex);
if (input_device_enabled(input_dev))
samsung_keypad_stop(keypad);
- samsung_keypad_toggle_wakeup(keypad, true);
+ ret = samsung_keypad_toggle_wakeup(keypad, true);
mutex_unlock(&input_dev->mutex);
- return 0;
+ return ret;
}
static int samsung_keypad_resume(struct device *dev)
@@ -545,17 +557,22 @@ static int samsung_keypad_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct samsung_keypad *keypad = platform_get_drvdata(pdev);
struct input_dev *input_dev = keypad->input_dev;
+ int ret;
mutex_lock(&input_dev->mutex);
- samsung_keypad_toggle_wakeup(keypad, false);
+ ret = samsung_keypad_toggle_wakeup(keypad, false);
+ if (ret) {
+ mutex_unlock(&input_dev->mutex);
+ return ret;
+ }
if (input_device_enabled(input_dev))
- samsung_keypad_start(keypad);
+ ret = samsung_keypad_start(keypad);
mutex_unlock(&input_dev->mutex);
- return 0;
+ return ret;
}
static const struct dev_pm_ops samsung_keypad_pm_ops = {
--
2.25.1
next prev parent reply other threads:[~2024-11-11 20:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 20:20 [PATCH] Input: ep93xx_keypad - Add check for clk_enable() and clk_prepare_enable Jiasheng Jiang
2024-11-11 20:20 ` Jiasheng Jiang [this message]
2024-11-11 20:20 ` [PATCH] Input: spear-keyboard - Add check for clk_enable() Jiasheng Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241111202006.6669-2-jiashengjiangcool@gmail.com \
--to=jiashengjiangcool@gmail.com \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dmitry.torokhov@gmail.com \
--cc=hartleys@visionengravers.com \
--cc=jy0922.shim@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nikita.shubin@maquefel.me \
--cc=rajeev-dlh.kumar@st.com \
--cc=shiraz.linux.kernel@gmail.com \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®