Merge branch 'master' into hpc2

[u-boot] / drivers / natsemi.c

diff --git a/drivers/natsemi.c b/drivers/natsemi.c
index 1c1b9a09b802af2d97cd2ed08214701e556de0dd..b009db63ebe404f5e816b8a0de22d7050f222fb7 100644 (file)
--- a/drivers/natsemi.c
+++ b/drivers/natsemi.c
@@ -756,6 +756,7 @@ natsemi_send(struct eth_device *dev, volatile void *packet, int length)
 {
        u32 i, status = 0;
        u32 tx_status = 0;
+       vu_long *res = (vu_long *)&tx_status;
 
        /* Stop the transmitter */
        OUTL(dev, TxOff, ChipCmd);
@@ -781,7 +782,7 @@ natsemi_send(struct eth_device *dev, volatile void *packet, int length)
        OUTL(dev, TxOn, ChipCmd);
 
        for (i = 0;
-            ((vu_long)tx_status = le32_to_cpu(txd.cmdsts)) & DescOwn;
+            (*res = le32_to_cpu(txd.cmdsts)) & DescOwn;
             i++) {
                if (i >= TOUT_LOOP) {
                        printf