Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199037
b: refs/heads/master
c: 162bb59
h: refs/heads/master
i:
  199035: 81060e4
v: v3
  • Loading branch information
Giel van Schijndel authored and Jean Delvare committed May 27, 2010
1 parent 652e12d commit 141ab71
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 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: 10f2ed31aae11040dfd64cee10c47db79b4b4647
refs/heads/master: 162bb59e498a15e27717bcc0831b97d393f2290d
11 changes: 5 additions & 6 deletions trunk/drivers/hwmon/f71882fg.c
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,11 @@ static int superio_inw(int base, int reg)
static inline void superio_enter(int base)
{
/* according to the datasheet the key must be send twice! */
outb( SIO_UNLOCK_KEY, base);
outb( SIO_UNLOCK_KEY, base);
outb(SIO_UNLOCK_KEY, base);
outb(SIO_UNLOCK_KEY, base);
}

static inline void superio_select( int base, int ld)
static inline void superio_select(int base, int ld)
{
outb(SIO_REG_LDSEL, base);
outb(ld, base + 1);
Expand Down Expand Up @@ -945,7 +945,7 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
mutex_lock(&data->update_lock);

/* Update once every 60 seconds */
if ( time_after(jiffies, data->last_limits + 60 * HZ ) ||
if (time_after(jiffies, data->last_limits + 60 * HZ) ||
!data->valid) {
if (data->type == f71882fg || data->type == f71889fg) {
data->in1_max =
Expand Down Expand Up @@ -2151,8 +2151,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
}

*address = superio_inw(sioaddr, SIO_REG_ADDR);
if (*address == 0)
{
if (*address == 0) {
printk(KERN_WARNING DRVNAME ": Base address not set\n");
goto exit;
}
Expand Down

0 comments on commit 141ab71

Please sign in to comment.