openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwmon: (it87) Avoid registering the same chip on both SIO addresses 

IT8705F is known to respond on both SIO addresses. Registering it twice
may result in system lockups.

Reported-by: Russell King <linux@armlinux.org.uk>
Fixes: e84bd9535e ("hwmon: (it87) Add support for second Super-IO chip")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2017-03-12 06:18:58 -07:00
parent dd7406dd33
commit 8358378b22
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/hwmon/it87.c
View File

@ -3198,7 +3198,7 @@ static int __init sm_it87_init(void)
{ {
int sioaddr[2] = { REG_2E, REG_4E }; int sioaddr[2] = { REG_2E, REG_4E };
struct it87_sio_data sio_data; struct it87_sio_data sio_data;
unsigned short isa_address; unsigned short isa_address[2];
bool found = false; bool found = false;
int i, err; int i, err;
@ -3208,15 +3208,29 @@ static int __init sm_it87_init(void)
for (i = 0; i < ARRAY_SIZE(sioaddr); i++) { for (i = 0; i < ARRAY_SIZE(sioaddr); i++) {
memset(&sio_data, 0, sizeof(struct it87_sio_data)); memset(&sio_data, 0, sizeof(struct it87_sio_data));
isa_address = 0; isa_address[i] = 0;
err = it87_find(sioaddr[i], &isa_address, &sio_data); err = it87_find(sioaddr[i], &isa_address[i], &sio_data);
if (err || isa_address == 0) if (err || isa_address[i] == 0)
continue; 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) if (err)
goto exit_dev_unregister; goto exit_dev_unregister;
found = true; found = true;
/*
* IT8705F may respond on both SIO addresses.
* Stop probing after finding one.
*/
if (sio_data.type == it87)
break;
} }
if (!found) { if (!found) {