diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-08-03 22:07:18 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-09-08 21:34:16 -0700 |
| commit | fc72af3ad43512bdea27cbd98f7acdb1e0354c2e (patch) | |
| tree | 56d84922f1f300bed863b2c23be7643cc1e483fa /drivers/hwmon | |
| parent | f9f7bb3a0efafb662a4c639bc62df1df2b7321f9 (diff) | |
| download | linux-fc72af3ad43512bdea27cbd98f7acdb1e0354c2e.tar.gz linux-fc72af3ad43512bdea27cbd98f7acdb1e0354c2e.tar.bz2 linux-fc72af3ad43512bdea27cbd98f7acdb1e0354c2e.zip | |
hwmon: (nct6775) Do not accept force_id unless chip is found
Since commit 698a7c24a544 ("hwmon: (nct6775) Support two SuperIO chips
in the same system"), the driver supports two Super-IO chips. This has
the undesirable side effect that force_id always detects a second chip
at address 0xfff8, even if no chip exists at that address.
nct6775: Found NCT6793D or compatible chip at 0x4e:0xfff8
If no chip at all is found at a given SIO address, it does not make sense
to instantiate it. Limit force_id to only work if some chip is found,
that is if the chip ID returns a value other than 0xffff.
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/nct6775.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index d087a8e00cf5..7859a30ce31e 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -4232,11 +4232,11 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data) if (err) return err; - if (force_id) + val = (superio_inb(sioaddr, SIO_REG_DEVID) << 8) | + superio_inb(sioaddr, SIO_REG_DEVID + 1); + if (force_id && val != 0xffff) val = force_id; - else - val = (superio_inb(sioaddr, SIO_REG_DEVID) << 8) - | superio_inb(sioaddr, SIO_REG_DEVID + 1); + switch (val & SIO_ID_MASK) { case SIO_NCT6106_ID: sio_data->kind = nct6106; |