diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 11:56:17 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 11:56:17 +0900 |
| commit | 701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb (patch) | |
| tree | c07aa954f48ec45c422641052d46008697a4a6b1 /drivers/net/ne.c | |
| parent | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net/ne.c')
| -rw-r--r-- | drivers/net/ne.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index b8e2923a1d6..1063093b3af 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c @@ -806,8 +806,10 @@ static int __init ne_drv_probe(struct platform_device *pdev) dev->base_addr = res->start; dev->irq = platform_get_irq(pdev, 0); } else { - if (this_dev < 0 || this_dev >= MAX_NE_CARDS) + if (this_dev < 0 || this_dev >= MAX_NE_CARDS) { + free_netdev(dev); return -EINVAL; + } dev->base_addr = io[this_dev]; dev->irq = irq[this_dev]; dev->mem_end = bad[this_dev]; |