Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20231
b: refs/heads/master
c: 8587521
h: refs/heads/master
i:
  20229: 5c2ab02
  20227: 8b7433c
  20223: 69c3042
v: v3
  • Loading branch information
Wim Van Sebroeck committed Feb 12, 2006
1 parent 9cb5398 commit 3ff3d2c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: 8f0235dccc3f7bffc32abcef2aec3d1b15c61927
refs/heads/master: 85875211acc94ecb76fe04fbebc6aca12b6da60d
14 changes: 7 additions & 7 deletions trunk/drivers/char/watchdog/pcwd.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,12 @@ static void unset_command_mode(void)
pcwd_private.command_mode = 0;
}

static inline void pcwd_check_temperature_support(void)
{
if (inb(pcwd_private.io_addr) != 0xF0)
pcwd_private.supports_temp = 1;
}

static void pcwd_timer_ping(unsigned long data)
{
int wdrst_stat;
Expand Down Expand Up @@ -623,12 +629,6 @@ static struct notifier_block pcwd_notifier = {
* Init & exit routines
*/

static inline void get_support(void)
{
if (inb(pcwd_private.io_addr) != 0xF0)
pcwd_private.supports_temp = 1;
}

static inline int get_revision(void)
{
int r = PCWD_REVISION_C;
Expand Down Expand Up @@ -730,7 +730,7 @@ static int __devinit pcwatchdog_init(int base_addr)
pcwd_stop();

/* Check whether or not the card supports the temperature device */
get_support();
pcwd_check_temperature_support();

/* Get some extra info from the hardware (in command/debug/diag mode) */
if (pcwd_private.revision == PCWD_REVISION_A)
Expand Down

0 comments on commit 3ff3d2c

Please sign in to comment.