aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/dme1737.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index c24b5b370daa..5a3d41fbdb3c 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -48,6 +48,11 @@ static unsigned short force_id;
48module_param(force_id, ushort, 0); 48module_param(force_id, ushort, 0);
49MODULE_PARM_DESC(force_id, "Override the detected device ID"); 49MODULE_PARM_DESC(force_id, "Override the detected device ID");
50 50
51static int probe_all_addr;
52module_param(probe_all_addr, bool, 0);
53MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "
54 "addresses");
55
51/* Addresses to scan */ 56/* Addresses to scan */
52static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END}; 57static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
53 58
@@ -2430,7 +2435,10 @@ static int __init dme1737_init(void)
2430 } 2435 }
2431 2436
2432 if (dme1737_isa_detect(0x2e, &addr) && 2437 if (dme1737_isa_detect(0x2e, &addr) &&
2433 dme1737_isa_detect(0x4e, &addr)) { 2438 dme1737_isa_detect(0x4e, &addr) &&
2439 (!probe_all_addr ||
2440 (dme1737_isa_detect(0x162e, &addr) &&
2441 dme1737_isa_detect(0x164e, &addr)))) {
2434 /* Return 0 if we didn't find an ISA device */ 2442 /* Return 0 if we didn't find an ISA device */
2435 return 0; 2443 return 0;
2436 } 2444 }