From 8ab2c15184df7d78cc4d70a088ce3f4b2b025efd Mon Sep 17 00:00:00 2001 From: Balaji T K Date: Mon, 2 Apr 2012 12:26:47 +0530 Subject: [PATCH] --- yaml --- r: 298811 b: refs/heads/master c: fc307df88f0d77505c19756d95be66c981c421ea h: refs/heads/master i: 298809: 819710c15e61e2c9d6371100511ff07c67bbc34f 298807: f60fa7252ef587c68e8652cb6de98f7705c8089e v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 35ce1fe0f588..7a16a1cc8654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b796450b4590dbaee2d31c85b04791cafacff9b4 +refs/heads/master: fc307df88f0d77505c19756d95be66c981c421ea diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index b4c59eac348f..5c2b1c10af9c 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -1818,8 +1818,6 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) if (res == NULL || irq < 0) return -ENXIO; - res->start += pdata->reg_offset; - res->end += pdata->reg_offset; res = request_mem_region(res->start, resource_size(res), pdev->name); if (res == NULL) return -EBUSY; @@ -1843,7 +1841,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) host->dma_ch = -1; host->irq = irq; host->slot_id = 0; - host->mapbase = res->start; + host->mapbase = res->start + pdata->reg_offset; host->base = ioremap(host->mapbase, SZ_4K); host->power_mode = MMC_POWER_OFF; host->next_data.cookie = 1;