diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-11-22 14:33:46 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-11-22 14:33:46 -0800 |
| commit | 5cf0eb9875cb26ebdc60d08444272b2ea219386e (patch) | |
| tree | 1176d44b0ffbc9e8798f89058f7d47b41f90bbd0 /drivers/input/misc | |
| parent | 42249094f79422fbf5ed4b54eeb48ff096809b8f (diff) | |
| parent | bd77c321945f652f6225847a8405f469601cd02c (diff) | |
| download | linux-5cf0eb9875cb26ebdc60d08444272b2ea219386e.tar.gz linux-5cf0eb9875cb26ebdc60d08444272b2ea219386e.tar.bz2 linux-5cf0eb9875cb26ebdc60d08444272b2ea219386e.zip | |
Merge branch 'next' into for-linus
Second round of input updates for 3.13.
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index 86b822806e95..45e0e3e55de2 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c @@ -180,7 +180,10 @@ static int64_t hp_sdc_rtc_read_i8042timer (uint8_t loadcmd, int numreg) if (WARN_ON(down_interruptible(&i8042tregs))) return -1; - if (hp_sdc_enqueue_transaction(&t)) return -1; + if (hp_sdc_enqueue_transaction(&t)) { + up(&i8042tregs); + return -1; + } /* Sleep until results come back. */ if (WARN_ON(down_interruptible(&i8042tregs))) |