projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'denx-coldfire' into coldfire-aug2007
[oweals/u-boot.git]
/
drivers
/
qe
/
uec.c
diff --git
a/drivers/qe/uec.c
b/drivers/qe/uec.c
index 89a72798232e87ad6f8c7f6faef531152fe8b4f4..dc2765bb09e6c6e981433f5fd0f6a5c43cc8e450 100644
(file)
--- a/
drivers/qe/uec.c
+++ b/
drivers/qe/uec.c
@@
-1110,7
+1110,7
@@
static int uec_init(struct eth_device* dev, bd_t *bd)
if (dev->enetaddr[0] & 0x01) {
printf("%s: MacAddress is multcast address\n",
__FUNCTION__);
if (dev->enetaddr[0] & 0x01) {
printf("%s: MacAddress is multcast address\n",
__FUNCTION__);
- return
-EINVAL
;
+ return
0
;
}
uec_set_mac_address(uec, dev->enetaddr);
uec->the_first_run = 1;
}
uec_set_mac_address(uec, dev->enetaddr);
uec->the_first_run = 1;
@@
-1119,10
+1119,10
@@
static int uec_init(struct eth_device* dev, bd_t *bd)
err = uec_open(uec, COMM_DIR_RX_AND_TX);
if (err) {
printf("%s: cannot enable UEC device\n", dev->name);
err = uec_open(uec, COMM_DIR_RX_AND_TX);
if (err) {
printf("%s: cannot enable UEC device\n", dev->name);
- return
err
;
+ return
0
;
}
}
- return
0
;
+ return
uec->mii_info->link
;
}
static void uec_halt(struct eth_device* dev)
}
static void uec_halt(struct eth_device* dev)