diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 11:26:34 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 11:26:34 +0300 |
| commit | 1cb4f624ea38361b6397966470f0a1bed5532483 (patch) | |
| tree | 418b05ddc854b09d64f7d5ee0c78875e42b5f151 /drivers/hwmon/w83627hf.c | |
| parent | 444c1953d496d272208902ff7010dc70d1f887f0 (diff) | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
| download | linux-1cb4f624ea38361b6397966470f0a1bed5532483.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into fixes
Diffstat (limited to 'drivers/hwmon/w83627hf.c')
| -rw-r--r-- | drivers/hwmon/w83627hf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index b257c7223733..38e280523071 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c @@ -1135,6 +1135,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, "W83687THF", }; + sio_data->sioaddr = sioaddr; superio_enter(sio_data); val = force_id ? force_id : superio_inb(sio_data, DEVID); switch (val) { @@ -1177,7 +1178,6 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, } err = 0; - sio_data->sioaddr = sioaddr; pr_info(DRVNAME ": Found %s chip at %#x\n", names[sio_data->type], *addr); |