diff options
author | Tom Rini <trini@ti.com> | 2012-09-27 19:06:07 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2012-09-27 19:06:07 (GMT) |
commit | cec2655c3b3b86f14a6a5c2cbb01833f7e3974be (patch) | |
tree | 8428f50b579b3656fd24056ae3c6304f58aee620 /drivers/net/armada100_fec.c | |
parent | c57b953da923c6402afc1c890c21fdc7d5a2cc4a (diff) | |
parent | ee0f60df0b71092cd632fc6651f4157a2d252598 (diff) | |
download | u-boot-cec2655c3b3b86f14a6a5c2cbb01833f7e3974be.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/armada100_fec.c')
-rw-r--r-- | drivers/net/armada100_fec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index d318a36..ed7cf20 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -565,7 +565,7 @@ static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize) struct tx_desc *p_txdesc = darmdfec->p_txdesc; void *p = (void *)dataptr; int retry = PHY_WAIT_ITERATIONS * PHY_WAIT_MICRO_SECONDS; - u32 cmd_sts; + u32 cmd_sts, temp; /* Copy buffer if it's misaligned */ if ((u32)dataptr & 0x07) { @@ -586,7 +586,8 @@ static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize) p_txdesc->byte_cnt = datasize; /* Apply send command using high priority TX queue */ - writel((u32)p_txdesc, ®s->txcdp[TXQ]); + temp = (u32)®s->txcdp[TXQ]; + writel((u32)p_txdesc, temp); writel(SDMA_CMD_TXDL | SDMA_CMD_TXDH | SDMA_CMD_ERD, ®s->sdma_cmd); /* |