X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/58bae6b28377ba29a9f5e7c8527cec857cab022a..519de6658dad2a75b585b3904ba68b152f72a1f0:/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c?ds=sidebyside

diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c
index b7808beb1..0d7a2aa22 100644
--- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c
+++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-mci.c
@@ -219,9 +219,9 @@ static void glamo_mci_fix_card_div(struct glamo_mci_host *host, int div)
 		writew(readw(host->pdata->pglamo->base +
 		             GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
 		       host->pdata->pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-		mdelay(5);
 	}
 	spin_unlock_irqrestore(&host->pdata->pglamo->lock, flags);
+	mdelay(5);
 }
 
 static int glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq)
@@ -738,7 +738,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
 	spin_lock_init(&host->lock);
 	INIT_WORK(&host->irq_work, glamo_mci_irq_worker);
 
-	host->regulator = regulator_get(&pdev->dev, "SD_3V3");
+	host->regulator = regulator_get(pdev->dev.parent, "SD_3V3");
 	if (!host->regulator) {
 		dev_err(&pdev->dev, "Cannot proceed without regulator.\n");
 		ret = -ENODEV;