diff options
| author | Helge Deller <deller@gmx.de> | 2013-02-27 22:46:56 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-03-02 19:56:36 +0100 |
| commit | 15fb9683c3e4eb1f8c6c982079a806b3894c2ba0 (patch) | |
| tree | 5bfdcb453b66e5489eaf857b5e423dcc80dad673 | |
| parent | parisc: avoid unitialized variable warning in pa_memcpy() (diff) | |
| download | linux-15fb9683c3e4eb1f8c6c982079a806b3894c2ba0.tar.xz linux-15fb9683c3e4eb1f8c6c982079a806b3894c2ba0.zip | |
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>
| -rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index 0b4f54265f62..2e3334b8f82d 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) { |