Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118890
b: refs/heads/master
c: e23a59e
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Nov 12, 2008
1 parent 0b49d7b commit 72b6f7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: d35aac10eb7bcb3b80bef16b60844af0313f47f7
refs/heads/master: e23a59e1ca6d177a57a7791b3629db93ff1d9813
3 changes: 1 addition & 2 deletions trunk/drivers/net/niu.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ MODULE_VERSION(DRV_MODULE_VERSION);
#ifndef readq
static u64 readq(void __iomem *reg)
{
return (((u64)readl(reg + 0x4UL) << 32) |
(u64)readl(reg));
return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
}

static void writeq(u64 val, void __iomem *reg)
Expand Down

0 comments on commit 72b6f7d

Please sign in to comment.