diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
| commit | 9b223555aa390e9a33ee8d4bbd2865fd1fbae9f7 (patch) | |
| tree | c9ef5f250ec76cda491b1dd6704d317448df3958 /drivers | |
| parent | ecde8243a8351725ff598f42c88ded154f8a0f1e (diff) | |
| parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/nand_util.c | 2 | ||||
| -rw-r--r-- | drivers/net/smc911x.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index bec927706..7085d42cc 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -452,7 +452,7 @@ static size_t get_len_incl_bad (nand_info_t *nand, loff_t offset, len_incl_bad += block_len; offset += block_len; - if ((offset + len_incl_bad) >= nand->size) + if (offset >= nand->size) break; } diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index c027abe9f..5d51406f6 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -37,7 +37,7 @@ void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \ #define mdelay(n) udelay((n)*1000) -static void smx911x_handle_mac_address(struct eth_device *dev) +static void smc911x_handle_mac_address(struct eth_device *dev) { unsigned long addrh, addrl; uchar *m = dev->enetaddr; @@ -155,7 +155,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd) /* Configure the PHY, initialize the link state */ smc911x_phy_configure(dev); - smx911x_handle_mac_address(dev); + smc911x_handle_mac_address(dev); /* Turn on Tx + Rx */ smc911x_enable(dev); |