Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10611
b: refs/heads/master
c: ca68f11
h: refs/heads/master
i:
  10609: aed4b19
  10607: 20ebbc7
v: v3
  • Loading branch information
Greg KH authored and Greg Kroah-Hartman committed Oct 28, 2005
1 parent 1fc241c commit 1689c7b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: ed5453e54f0c4a29605fd8399f58649d8739f5f0
refs/heads/master: ca68f1193e8fc86470d4222d563d13b5584dc4f8
6 changes: 2 additions & 4 deletions trunk/drivers/i2c/busses/i2c-viapro.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ static void vt596_dump_regs(const char *msg, u8 size)
printk("%02x\n", inb_p(SMBBLKDAT));
}
}
#else
static inline void vt596_dump_regs(const char *msg, u8 size) { }
#endif

/* Return -1 on error, 0 on success */
Expand All @@ -135,9 +137,7 @@ static int vt596_transaction(u8 size)
int result = 0;
int timeout = 0;

#ifdef DEBUG
vt596_dump_regs("Transaction (pre)", size);
#endif

/* Make sure the SMBus host is ready to start transmitting */
if ((temp = inb_p(SMBHSTSTS)) & 0x1F) {
Expand Down Expand Up @@ -192,9 +192,7 @@ static int vt596_transaction(u8 size)
if (temp & 0x1F)
outb_p(temp, SMBHSTSTS);

#ifdef DEBUG
vt596_dump_regs("Transaction (post)", size);
#endif

return result;
}
Expand Down

0 comments on commit 1689c7b

Please sign in to comment.