Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68706
b: refs/heads/master
c: 8afb104
h: refs/heads/master
v: v3
  • Loading branch information
Mark M. Hoffman committed Oct 10, 2007
1 parent 8840044 commit db86729
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: 45fb366940d51c309581813ef35bb70a9e34b17d
refs/heads/master: 8afb10490b18e916e33707baa7d1cfc615d545ea
14 changes: 7 additions & 7 deletions trunk/drivers/hwmon/f71882fg.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static struct f71882fg_data *f71882fg_update_device(struct device * dev)
}

/* Update every second */
if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
data->temp_status = f71882fg_read8(data,
F71882FG_REG_TEMP_STATUS);
data->temp_diode_open = f71882fg_read8(data,
Expand Down Expand Up @@ -614,7 +614,7 @@ static ssize_t store_temp_max_hyst(struct device *dev, struct device_attribute
data->temp_hyst[nr] = val;

/* convert value to register contents */
switch(nr) {
switch (nr) {
case 0:
val = val << 4;
break;
Expand Down Expand Up @@ -748,7 +748,7 @@ static int __devinit f71882fg_probe(struct platform_device * pdev)
int err, i;
u8 start_reg;

if(!(data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL)))
if (!(data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL)))
return -ENOMEM;

data->addr = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
Expand Down Expand Up @@ -850,7 +850,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address)
}

superio_select(sioaddr, SIO_F71882FG_LD_HWM);
if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
printk(KERN_WARNING DRVNAME ": Device not activated\n");
goto exit;
}
Expand Down Expand Up @@ -890,18 +890,18 @@ static int __init f71882fg_device_add(unsigned short address)
int err;

f71882fg_pdev = platform_device_alloc(DRVNAME, address);
if(!f71882fg_pdev)
if (!f71882fg_pdev)
return -ENOMEM;

res.name = f71882fg_pdev->name;
err = platform_device_add_resources(f71882fg_pdev, &res, 1);
if(err) {
if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed\n");
goto exit_device_put;
}

err = platform_device_add(f71882fg_pdev);
if(err) {
if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed\n");
goto exit_device_put;
}
Expand Down

0 comments on commit db86729

Please sign in to comment.