Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 360692
b: refs/heads/master
c: 15fb968
h: refs/heads/master
v: v3
  • Loading branch information
Helge Deller committed Mar 2, 2013
1 parent 05ae5d3 commit c1e18a9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d8d0524a39056dbdafece1ed65ae51afc711c8b5
refs/heads/master: 15fb9683c3e4eb1f8c6c982079a806b3894c2ba0
15 changes: 12 additions & 3 deletions trunk/drivers/input/misc/hp_sdc_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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] |
Expand Down Expand Up @@ -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] |
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit c1e18a9

Please sign in to comment.