Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296814
b: refs/heads/master
c: 6f53d10
h: refs/heads/master
v: v3
  • Loading branch information
Jonas Aaberg authored and Samuel Ortiz committed Mar 6, 2012
1 parent ba3a996 commit a690733
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 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: 4d64d2e34bc415b05eb77a2732a3164313cf6de3
refs/heads/master: 6f53d10dda1323c17fb09063c4df2c22754bf8aa
8 changes: 0 additions & 8 deletions trunk/drivers/mfd/db8500-prcmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2184,16 +2184,8 @@ int db8500_prcmu_kick_a9wdog(u8 id)
/*
* timeout is 28 bit, in ms.
*/
#define MAX_WATCHDOG_TIMEOUT 131000
int db8500_prcmu_load_a9wdog(u8 id, u32 timeout)
{
if (timeout > MAX_WATCHDOG_TIMEOUT)
/*
* Due to calculation bug in prcmu fw, timeouts
* can't be bigger than 131 seconds.
*/
return -EINVAL;

return prcmu_a9wdog(MB4H_A9WDOG_LOAD,
(id & A9WDOG_ID_MASK) |
/*
Expand Down

0 comments on commit a690733

Please sign in to comment.