From: Helge Deller <deller@gmx.de>
To: linux-parisc@vger.kernel.org,
James Bottomley <James.Bottomley@HansenPartnership.com>
Subject: parisc: check return value of down_interruptible() in hp_sdc_rtc.c
Date: Wed, 27 Feb 2013 23:22:23 +0100 [thread overview]
Message-ID: <20130227222223.GA2941@p100.box> (raw)
In-Reply-To: <20130227221137.GA2806@p100.box>
commit 42dfe13d133f945b49377c29b8c828205b231b4c
Author: Helge Deller <deller@gmx.de>
Date: Wed Feb 27 22:46:56 2013 +0100
parisc: check return value of down_interruptible() in hp_sdc_rtc.c
additionally comment out unused code (which may be used later)
Signed-off-by: Helge Deller <deller@gmx.de>
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 0b4f542..2e3334b 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -109,7 +109,9 @@ static int hp_sdc_rtc_do_read_bbrtc (struct rtc_time *rtctm)
if (hp_sdc_enqueue_transaction(&t)) return -1;
- down_interruptible(&tsem); /* Put ourselves to sleep for results. */
+ /* Put ourselves to sleep for results. */
+ if (WARN_ON(down_interruptible(&tsem)))
+ return -1;
/* Check for nonpresence of BBRTC */
if (!((tseq[83] | tseq[90] | tseq[69] | tseq[76] |
@@ -176,11 +178,16 @@ static int64_t hp_sdc_rtc_read_i8042timer (uint8_t loadcmd, int numreg)
t.seq = tseq;
t.act.semaphore = &i8042tregs;
- down_interruptible(&i8042tregs); /* Sleep if output regs in use. */
+ /* Sleep if output regs in use. */
+ if (WARN_ON(down_interruptible(&i8042tregs)))
+ return -1;
if (hp_sdc_enqueue_transaction(&t)) return -1;
- down_interruptible(&i8042tregs); /* Sleep until results come back. */
+ /* Sleep until results come back. */
+ if (WARN_ON(down_interruptible(&i8042tregs)))
+ return -1;
+
up(&i8042tregs);
return (tseq[5] |
@@ -276,6 +283,7 @@ static inline int hp_sdc_rtc_read_ct(struct timeval *res) {
}
+#if 0 /* not used yet */
/* Set the i8042 real-time clock */
static int hp_sdc_rtc_set_rt (struct timeval *setto)
{
@@ -386,6 +394,7 @@ static int hp_sdc_rtc_set_i8042timer (struct timeval *setto, uint8_t setcmd)
}
return 0;
}
+#endif
static ssize_t hp_sdc_rtc_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos) {
next prev parent reply other threads:[~2013-02-27 22:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-27 22:11 upcoming patches for 3.9 Helge Deller
2013-02-27 22:13 ` parisc: select ARCH_WANT_FRAME_POINTERS Helge Deller
2013-02-27 22:15 ` parisc: fix compile warnings triggered by atomic_sub(sizeof(),v) Helge Deller
2013-02-27 23:09 ` Rolf Eike Beer
2013-02-27 23:41 ` Helge Deller
2013-02-27 22:17 ` parisc: switch to compat_functions of io_setup, io_getevents and io_submit Helge Deller
2013-02-27 22:19 ` parisc: remove unused variable 'compat_val' Helge Deller
2013-02-27 22:21 ` parisc: avoid unitialized variable warning in pa_memcpy() Helge Deller
2013-02-27 22:22 ` Helge Deller [this message]
2013-03-02 19:40 ` parisc: fix redefinition of SET_PERSONALITY Helge Deller
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=20130227222223.GA2941@p100.box \
--to=deller@gmx.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-parisc@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.