Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61817
b: refs/heads/master
c: 9c2e14a
h: refs/heads/master
i:
  61815: dfaa310
v: v3
  • Loading branch information
Hans de Goede authored and Mark M. Hoffman committed Jul 19, 2007
1 parent de0345f commit 417379c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f66036b4f95f5e830d68a3ce90aeece0e0c4bf3
refs/heads/master: 9c2e14afb98f761ec80ea809adbc87b15b060e7b
11 changes: 6 additions & 5 deletions trunk/drivers/hwmon/abituguru3.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ static const struct abituguru3_motherboard_info abituguru3_motherboards[] = {
{ "AUX4 Fan", 38, 2, 60, 1, 0 },
{ NULL, 0, 0, 0, 0, 0 } }
},
{ 0x0014, "unknown", {
{ 0x0014, "Abit AB9 Pro", {
{ "CPU Core", 0, 0, 10, 1, 0 },
{ "DDR", 1, 0, 10, 1, 0 },
{ "DDR VTT", 2, 0, 10, 1, 0 },
Expand Down Expand Up @@ -1053,12 +1053,13 @@ static struct platform_driver abituguru3_driver = {

static int __init abituguru3_detect(void)
{
/* See if there is an uguru3 there. An idle uGuru3 will hold 0x00
at DATA and 0xAC at CMD. Sometimes the uGuru3 will hold 0x05 at
CMD instead, why is unknown. So we test for 0x05 too. */
/* See if there is an uguru3 there. An idle uGuru3 will hold 0x00 or
0x08 at DATA and 0xAC at CMD. Sometimes the uGuru3 will hold 0x05
at CMD instead, why is unknown. So we test for 0x05 too. */
u8 data_val = inb_p(ABIT_UGURU3_BASE + ABIT_UGURU3_DATA);
u8 cmd_val = inb_p(ABIT_UGURU3_BASE + ABIT_UGURU3_CMD);
if ((data_val == 0x00) && ((cmd_val == 0xAC) || (cmd_val == 0x05)))
if (((data_val == 0x00) || (data_val == 0x08)) &&
((cmd_val == 0xAC) || (cmd_val == 0x05)))
return ABIT_UGURU3_BASE;

ABIT_UGURU3_DEBUG("no Abit uGuru3 found, data = 0x%02X, cmd = "
Expand Down

0 comments on commit 417379c

Please sign in to comment.