Skip to contentSkip to conversation

therm_adt746x: Don't access non-existing register

PATCH In review Jean Delvare 2 participants 2 messages Oct 14, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 therm_adt746x: Don't access non-existing register

The ADT746x don't have any register at sub-address 0, so better use an existing register for the initial test read.

Cc Colin Leroy <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>

---
Tim, I don't really expect this to solve your problem, but who knows... Care to give it a try, just in case?

 drivers/macintosh/therm_adt746x.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/macintosh/therm_adt746x.c +1 -1
@@ -387,7 +387,7 @@ static int probe_thermostat(struct i2c_c
 	i2c_set_clientdata(client, th);
 	th->clt = client;
 
-	rc = read_reg(th, 0);
+	rc = read_reg(th, CONFIG_REG);
 	if (rc < 0) {
 		dev_err(&client->dev, "Thermostat failed to read config!\n");
 		kfree(th);
Signature · 1 line
Jean Delvare
#1 lore raw

Jean,

I tried one reboot with your patch, failed as usual. (Patch sounds like a good idea though.)

-Tim Shepard
[email protected]

tree<11>$ git describe
v2.6.31.1-6-g0b193bc
tree<12>$ git diff HEAD^ HEAD

drivers/macintosh/therm_adt746x.c +1 -1
index 0554dae..bf9ed2d 100644
@@ -366,7 +366,7 @@ static int probe_thermostat(struct i2c_client *client,
        i2c_set_clientdata(client, th);
        th->clt = client;
 
-       rc = read_reg(th, 0);
+       rc = read_reg(th, CONFIG_REG);
        if (rc < 0) {
                dev_err(&client->dev, "Thermostat failed to read config!\n");
                kfree(th);

tree<13>$ dmesg | head
Using PowerMac machine description
Total memory = 1536MB; using 4096kB for hash table (at cfc00000)
Linux version 2.6.31.1-00006-g0b193bc (shep@tree) (gcc version 4.3.2 (Debian 4.3.2-1.1) ) #9 Wed Oct 14 13:41:40 EDT 2009 Found UniNorth memory controller & host bridge @ 0xf8000000 revision: 0xd9
Mapped at 0xff7c0000
Found a Intrepid mac-io controller, rev: 0, mapped at 0xff740000
Processor NAP mode on idle enabled.
PowerMac motherboard: PowerBook G4 15"
console [udbg0] enabled
Found UniNorth PCI host bridge at 0x00000000f0000000. Firmware bus number: 0->1
tree<14>$ dmesg | grep adt
adt746x: version 1 (supported)
adt746x: Thermostat bus: 0, address: 0x2e, limit_adjust: 0, fan_speed: -1
therm_adt746x 7-002e: Thermostat failed to read config!
tree<15>$