summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorRemy Bohmer <linux@bohmer.net>2008-06-04 10:47:25 +0200
committerBen Warren <biggerbadderben@gmail.com>2008-06-04 23:49:28 -0700
commitd6ee5fa40c26970d39990c6fc4a2f20a97822650 (patch)
treeb93812dc3923eb7644f737a85e7405e93b534fe4 /drivers/net
parent98291e2e689096420465074cce926b226d2e71b4 (diff)
Fix order for reading rx-status registers in 32bit mode of DM9000
A last minute cleanup before submitting the DM9000A patch series yesterday introduced a bug in reading the rx-status registers in 32bit mode only. This patch repairs this. Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/dm9000x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 2945995457b..6f3ddf020da 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -211,10 +211,11 @@ static void dm9000_inblk_32bit(void *data_ptr, int count)
static void dm9000_rx_status_32bit(u16 *RxStatus, u16 *RxLen)
{
- u32 tmpdata = DM9000_inl(DM9000_DATA);
+ u32 tmpdata;
DM9000_outb(DM9000_MRCMD, DM9000_IO);
+ tmpdata = DM9000_inl(DM9000_DATA);
*RxStatus = tmpdata;
*RxLen = tmpdata >> 16;
}