---

yaml
---
r: 298811
b: refs/heads/master
c: fc307df
h: refs/heads/master
i:
  298809: 819710c
  298807: f60fa72
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b796450b4590dbaee2d31c85b04791cafacff9b4
+refs/heads/master: fc307df88f0d77505c19756d95be66c981c421ea

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;