|
@@ -388,9 +388,9 @@ static void axi_dma_init(struct eth_device *dev)
|
|
while (timeout--) {
|
|
while (timeout--) {
|
|
/* Check transmit/receive channel */
|
|
/* Check transmit/receive channel */
|
|
/* Reset is done when the reset bit is low */
|
|
/* Reset is done when the reset bit is low */
|
|
- if (!(in_be32(&priv->dmatx->control) |
|
|
|
|
|
|
+ if (!((in_be32(&priv->dmatx->control) |
|
|
in_be32(&priv->dmarx->control))
|
|
in_be32(&priv->dmarx->control))
|
|
- & XAXIDMA_CR_RESET_MASK) {
|
|
|
|
|
|
+ & XAXIDMA_CR_RESET_MASK)) {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -498,8 +498,8 @@ static int axiemac_send(struct eth_device *dev, void *ptr, int len)
|
|
/* Wait for transmission to complete */
|
|
/* Wait for transmission to complete */
|
|
debug("axiemac: Waiting for tx to be done\n");
|
|
debug("axiemac: Waiting for tx to be done\n");
|
|
timeout = 200;
|
|
timeout = 200;
|
|
- while (timeout && (!in_be32(&priv->dmatx->status) &
|
|
|
|
- (XAXIDMA_IRQ_DELAY_MASK | XAXIDMA_IRQ_IOC_MASK))) {
|
|
|
|
|
|
+ while (timeout && (!(in_be32(&priv->dmatx->status) &
|
|
|
|
+ (XAXIDMA_IRQ_DELAY_MASK | XAXIDMA_IRQ_IOC_MASK)))) {
|
|
timeout--;
|
|
timeout--;
|
|
udelay(1);
|
|
udelay(1);
|
|
}
|
|
}
|