Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / net / smc91x.c

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index d2c493918030198e8c2b1c8b3d8eb76771f306a5..cebabd49e5a4f00016c3be321338ed912e6b335f 100644 (file)
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2260,7 +2260,7 @@ static int smc_drv_remove(struct platform_device *pdev)
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
        if (!res)
-               platform_get_resource(pdev, IORESOURCE_MEM, 0);
+               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        release_mem_region(res->start, SMC_IO_EXTENT);
 
        free_netdev(ndev);