diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/hwmon/abituguru.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/hwmon/abituguru.c')
-rw-r--r-- | drivers/hwmon/abituguru.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c index 0e05aa179eaa..e7d4c4687f02 100644 --- a/drivers/hwmon/abituguru.c +++ b/drivers/hwmon/abituguru.c | |||
@@ -1422,7 +1422,7 @@ static int __init abituguru_detect(void) | |||
1422 | at DATA and 0xAC, when this driver has already been loaded once | 1422 | at DATA and 0xAC, when this driver has already been loaded once |
1423 | DATA will hold 0x08. For most uGuru's CMD will hold 0xAC in either | 1423 | DATA will hold 0x08. For most uGuru's CMD will hold 0xAC in either |
1424 | scenario but some will hold 0x00. | 1424 | scenario but some will hold 0x00. |
1425 | Some uGuru's initally hold 0x09 at DATA and will only hold 0x08 | 1425 | Some uGuru's initially hold 0x09 at DATA and will only hold 0x08 |
1426 | after reading CMD first, so CMD must be read first! */ | 1426 | after reading CMD first, so CMD must be read first! */ |
1427 | u8 cmd_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_CMD); | 1427 | u8 cmd_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_CMD); |
1428 | u8 data_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_DATA); | 1428 | u8 data_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_DATA); |