aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-01-19 09:56:29 +0100
committerLars-Peter Clausen <lars@metafoo.de>2010-01-19 09:56:29 +0100
commita1e601e290a9887c68cc64833d7645ed62bc8d7a (patch)
treeeda083ac9dcd051af71894c6889f8ce7ca8dfc87
parent97207e0b1d7c340abd5ab20b1654d27c09599f4c (diff)
s3c-mci: Disable write-protect and detect gpios in default platfrom data
Due to the change that gpio0 is now seen as a valid gpio by the driver it tries to request gpio0 as card detect and write-protect pin if no platform_data was given. This patch initalises no_wprotect and no_detect of the default platform data to 1 and restores pre 2.6.32 behaviour.
-rw-r--r--drivers/mmc/host/s3cmci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 99b74a35102..f3d1b94c1fb 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1361,6 +1361,8 @@ static struct mmc_host_ops s3cmci_ops = {
static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
/* This is currently here to avoid a number of if (host->pdata)
* checks. Any zero fields to ensure reaonable defaults are picked. */
+ .no_detect = 1,
+ .no_wprotect = 1,
};
#ifdef CONFIG_CPU_FREQ