From c9a12491a12c53008287709088954d01e5ebed94 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 5 May 2010 22:12:20 +0000 Subject: [PATCH] --- yaml --- r: 194799 b: refs/heads/master c: 575400bf5d57f53a767bc215bd709e65e5b27a5c h: refs/heads/master i: 194797: b6509d301f7bcd9e48950b77e07523590826aec6 194795: f9f3664f9ea959d92b7185bb5b4f6c5dcfc995f3 194791: 8dbceedc87470efe931c6fa8fed34ab5ff371e98 194783: e4299adb7a89c48b47ab59a119476fe4fcf909ea v: v3 --- [refs] | 2 +- trunk/drivers/net/xilinx_emaclite.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3fe23d25e421..ddf9ba499f19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 627c8a041f7aaaea93c766f69bd61d952a277586 +refs/heads/master: 575400bf5d57f53a767bc215bd709e65e5b27a5c diff --git a/trunk/drivers/net/xilinx_emaclite.c b/trunk/drivers/net/xilinx_emaclite.c index e9381fe3baf4..93828d565390 100644 --- a/trunk/drivers/net/xilinx_emaclite.c +++ b/trunk/drivers/net/xilinx_emaclite.c @@ -1171,7 +1171,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev, } /* Get the virtual base address for the device */ - lp->base_addr = ioremap(r_mem.start, r_mem.end - r_mem.start + 1); + lp->base_addr = ioremap(r_mem.start, resource_size(&r_mem)); if (NULL == lp->base_addr) { dev_err(dev, "EmacLite: Could not allocate iomem\n"); rc = -EIO; @@ -1224,7 +1224,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev, return 0; error1: - release_mem_region(ndev->mem_start, r_mem.end - r_mem.start + 1); + release_mem_region(ndev->mem_start, resource_size(&r_mem)); error2: xemaclite_remove_ndev(ndev);