diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-01-10 14:28:18 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-01-10 14:28:18 -0600 |
| commit | bb66f5613672fc80a6b38a0e1651d893bbe590a5 (patch) | |
| tree | 9a8af7224b4dc2162a5cec00cf44d5afae43622f /drivers/net/uli526x.c | |
| parent | b830b7f1635984ba607219fcbd78597c28eeb529 (diff) | |
| parent | 422b1a01602b6e2fbf8444a1192c7ba31461fd4c (diff) | |
| download | u-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/uli526x.c')
| -rw-r--r-- | drivers/net/uli526x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c index 1267c57..8460f69 100644 --- a/drivers/net/uli526x.c +++ b/drivers/net/uli526x.c @@ -279,12 +279,12 @@ static int uli526x_init_one(struct eth_device *dev, bd_t *bis) db->desc_pool_ptr = (uchar *)&desc_pool_array[0]; db->desc_pool_dma_ptr = (dma_addr_t)&desc_pool_array[0]; if (db->desc_pool_ptr == NULL) - return 0; + return -1; db->buf_pool_ptr = &buf_pool[0]; db->buf_pool_dma_ptr = (dma_addr_t)&buf_pool[0]; if (db->buf_pool_ptr == NULL) - return 0; + return -1; db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr; db->first_tx_desc_dma = db->desc_pool_dma_ptr; @@ -331,7 +331,7 @@ static int uli526x_init_one(struct eth_device *dev, bd_t *bis) db->cr6_data |= ULI526X_TXTH_256; db->cr0_data = CR0_DEFAULT; uli526x_init(dev); - return 1; + return 0; } static void uli526x_disable(struct eth_device *dev) |