diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
| commit | df69471290cbec7714f6d1fabd14f4e41219cee1 (patch) | |
| tree | 1a8d9d3fce98db7b4382c24994feba6fa771805f /drivers/net/smc91x.c | |
| parent | d994af0d50efc96b2077978fe9f066992639d525 (diff) | |
| parent | 17393dd67c06c3912ff47b31268b648929715336 (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/smc91x.c')
| -rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 2040965d7724..24768c10cadb 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -2255,7 +2255,7 @@ static int smc_drv_remove(struct platform_device *pdev) | |||
| 2255 | 2255 | ||
| 2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); | 2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); |
| 2257 | if (!res) | 2257 | if (!res) |
| 2258 | platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2258 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 2259 | release_mem_region(res->start, SMC_IO_EXTENT); | 2259 | release_mem_region(res->start, SMC_IO_EXTENT); |
| 2260 | 2260 | ||
| 2261 | free_netdev(ndev); | 2261 | free_netdev(ndev); |