From d6eb420bbab592b87c3aaef6783d09063ba59589 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 4 Jul 2009 11:31:47 +0000 Subject: [PATCH] --- yaml --- r: 155015 b: refs/heads/master c: 3942453948015228d6b1ae9835a6f6ca3e842aaa h: refs/heads/master i: 155013: c8e1e6883f7aee1ae54b75648ec3a75addc16e67 155011: 678f0be5f2e5ed8fef3d330b95c67153eb675e6e 155007: a08d3f972cd0ba31073a5ed85b9603ca94248678 v: v3 --- [refs] | 2 +- trunk/drivers/net/smsc911x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6ee6f02a59f3..df12add020fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c3dd308adbda61f2ab46a14a0adcca8e1338ea5 +refs/heads/master: 3942453948015228d6b1ae9835a6f6ca3e842aaa diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c index b60639bd181b..66067f9d91c0 100644 --- a/trunk/drivers/net/smsc911x.c +++ b/trunk/drivers/net/smsc911x.c @@ -1938,7 +1938,7 @@ static int __devexit smsc911x_drv_remove(struct platform_device *pdev) if (!res) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - release_mem_region(res->start, res->end - res->start); + release_mem_region(res->start, resource_size(res)); iounmap(pdata->ioaddr); @@ -1976,7 +1976,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) retval = -ENODEV; goto out_0; } - res_size = res->end - res->start + 1; + res_size = resource_size(res); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!irq_res) { @@ -2104,7 +2104,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) out_free_netdev_2: free_netdev(dev); out_release_io_1: - release_mem_region(res->start, res->end - res->start); + release_mem_region(res->start, resource_size(res)); out_0: return retval; }