diff --git a/[refs] b/[refs] index 933403f8f2d8..f98f1db964e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc26977f77dd3486b59516d2cc03627009c0d4c6 +refs/heads/master: d45227391c70ea12ec129ebfa97841e9b7ff34fd diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c index d94560f9eac7..5e989d884ddd 100644 --- a/trunk/drivers/net/smsc911x.c +++ b/trunk/drivers/net/smsc911x.c @@ -1874,7 +1874,7 @@ static int __devexit smsc911x_drv_remove(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smsc911x-memory"); if (!res) - platform_get_resource(pdev, IORESOURCE_MEM, 0); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(res->start, res->end - res->start);