summaryrefslogtreecommitdiff
path: root/drivers/net/dc2114x.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-01-10 14:28:18 -0600
committerJon Loeliger <jdl@freescale.com>2008-01-10 14:28:18 -0600
commitbb66f5613672fc80a6b38a0e1651d893bbe590a5 (patch)
tree9a8af7224b4dc2162a5cec00cf44d5afae43622f /drivers/net/dc2114x.c
parentb830b7f1635984ba607219fcbd78597c28eeb529 (diff)
parent422b1a01602b6e2fbf8444a1192c7ba31461fd4c (diff)
downloadu-boot-imx-bb66f5613672fc80a6b38a0e1651d893bbe590a5.zip
u-boot-imx-bb66f5613672fc80a6b38a0e1651d893bbe590a5.tar.gz
u-boot-imx-bb66f5613672fc80a6b38a0e1651d893bbe590a5.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'drivers/net/dc2114x.c')
-rw-r--r--drivers/net/dc2114x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index d5275dc..7238922 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -332,7 +332,7 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
if ((INL(dev, DE4X5_STS) & (STS_TS | STS_RS)) != 0) {
printf("Error: Cannot reset ethernet controller.\n");
- return 0;
+ return -1;
}
#ifdef CONFIG_TULIP_SELECT_MEDIA
@@ -382,7 +382,7 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
send_setup_frame(dev, bis);
- return 1;
+ return 0;
}
static int dc21x4x_send(struct eth_device* dev, volatile void *packet, int length)