summaryrefslogtreecommitdiff
path: root/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch
blob: 1f996fafafb4b52d6f2cf648d084a597356b93af (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 10e7f7b2132aaac8e3ebc549d3837cc2df888df7 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 29 Jun 2010 12:54:03 +0200
Subject: [PATCH] glamo-mci: add MMC_CAP_NONREMOVABLE and move enable_irq to right place

---
 drivers/mmc/host/glamo-mci.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/glamo-mci.c b/drivers/mmc/host/glamo-mci.c
index b2442c2..11deb7d 100644
--- a/drivers/mmc/host/glamo-mci.c
+++ b/drivers/mmc/host/glamo-mci.c
@@ -811,6 +811,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
 	mmc->ocr_avail	= mmc_regulator_get_ocrmask(host->regulator);
 	mmc->caps	= MMC_CAP_4_BIT_DATA |
 			    MMC_CAP_MMC_HIGHSPEED |
+			    MMC_CAP_NONREMOVABLE |
 			    MMC_CAP_SD_HIGHSPEED;
 	mmc->f_min	= host->clk_rate / 256;
 	mmc->f_max	= sd_max_clk;
@@ -930,10 +931,10 @@ static int glamo_mci_resume(struct device *dev)
 	glamo_mci_reset(host);
 	mdelay(10);
 
-	ret = mmc_resume_host(host->mmc);
-
 	enable_irq(host->irq);
 
+	ret = mmc_resume_host(host->mmc);
+
 	mmc_host_lazy_disable(host->mmc);
 
 	return ret;
-- 
1.7.1