From a1e601e290a9887c68cc64833d7645ed62bc8d7a Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 19 Jan 2010 09:56:29 +0100 Subject: 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. --- drivers/mmc/host/s3cmci.c | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3