diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-03-28 02:03:35 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-03-28 02:03:35 +0200 |
| commit | 840c91dc6a13b160f5b6e5c79c430dffac11c945 (patch) | |
| tree | 5309824f4531b2611a575e7971a935d2e95feb02 /drivers/hwmon/it87.c | |
| parent | LSM: Initialize security_hook_heads upon registration. (diff) | |
| parent | Linux 4.11-rc4 (diff) | |
| download | linux-840c91dc6a13b160f5b6e5c79c430dffac11c945.tar.xz linux-840c91dc6a13b160f5b6e5c79c430dffac11c945.zip | |
update to v4.11-rc4 due to memory corruption bug in rc2
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index efb01c247e2d..4dfc7238313e 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -3198,7 +3198,7 @@ static int __init sm_it87_init(void) { int sioaddr[2] = { REG_2E, REG_4E }; struct it87_sio_data sio_data; - unsigned short isa_address; + unsigned short isa_address[2]; bool found = false; int i, err; @@ -3208,15 +3208,29 @@ static int __init sm_it87_init(void) for (i = 0; i < ARRAY_SIZE(sioaddr); i++) { memset(&sio_data, 0, sizeof(struct it87_sio_data)); - isa_address = 0; - err = it87_find(sioaddr[i], &isa_address, &sio_data); - if (err || isa_address == 0) + isa_address[i] = 0; + err = it87_find(sioaddr[i], &isa_address[i], &sio_data); + if (err || isa_address[i] == 0) continue; + /* + * Don't register second chip if its ISA address matches + * the first chip's ISA address. + */ + if (i && isa_address[i] == isa_address[0]) + break; - err = it87_device_add(i, isa_address, &sio_data); + err = it87_device_add(i, isa_address[i], &sio_data); if (err) goto exit_dev_unregister; + found = true; + + /* + * IT8705F may respond on both SIO addresses. + * Stop probing after finding one. + */ + if (sio_data.type == it87) + break; } if (!found) { |