From: Haoran Liu <liuhaoran14@163.com>
To: ysato@users.sourceforge.jp
Cc: dalias@libc.org, glaubitz@physik.fu-berlin.de,
linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org,
Haoran Liu <liuhaoran14@163.com>
Subject: [PATCH] [sh/highlander] psw: Add error handling in psw_irq_handler
Date: Tue, 28 Nov 2023 22:37:30 -0800 [thread overview]
Message-ID: <20231129063730.31184-1-liuhaoran14@163.com> (raw)
This patch adds error handling for the platform_get_drvdata call
within the psw_irq_handler function in
arch/sh/boards/mach-highlander/psw.c. Previously, the absence of
error checking could lead to unexpected behavior if
platform_get_drvdata returned a null pointer.
Signed-off-by: Haoran Liu <liuhaoran14@163.com>
---
arch/sh/boards/mach-highlander/psw.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/sh/boards/mach-highlander/psw.c b/arch/sh/boards/mach-highlander/psw.c
index d445c54f74e4..e079215e50e3 100644
--- a/arch/sh/boards/mach-highlander/psw.c
+++ b/arch/sh/boards/mach-highlander/psw.c
@@ -21,6 +21,12 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
unsigned int l, mask;
int ret = 0;
+ if (!psw) {
+ pr_err("psw_irq_handler: No push_switch data associated
+ with platform_device\n");
+ return IRQ_NONE;
+ }
+
l = __raw_readw(PA_DBSW);
/* Nothing to do if there's no state change */
--
2.17.1
next reply other threads:[~2023-11-29 6:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 6:37 Haoran Liu [this message]
2023-11-29 8:10 ` [PATCH] [sh/highlander] psw: Add error handling in psw_irq_handler Geert Uytterhoeven
2023-12-01 9:48 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2023-11-29 7:38 Haoran Liu
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=20231129063730.31184-1-liuhaoran14@163.com \
--to=liuhaoran14@163.com \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).