aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2005-09-12 20:36:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-09-12 20:36:19 +0100
commit210ce2a7504e429b7ccc191b1efba4c772c4d8b6 (patch)
tree83b765a1f8cd21a8169fcdbadb731db165a32a42
parente062c8ae85df633f2ecaa5a5af0d9922ced5e074 (diff)
downloadlinux-linaro-210ce2a7504e429b7ccc191b1efba4c772c4d8b6.tar.gz
[MMC] Clean up wbsd detection handling
The wbsd driver's card detection routing is a bit of a mess. This patch cleans up the routine and makes it a bit more comprihensible. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/mmc/wbsd.c29
1 files changed, 12 insertions, 17 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 46e5f9a17a2..3cbca7cbea8 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -1136,6 +1136,7 @@ static void wbsd_tasklet_card(unsigned long param)
{
struct wbsd_host* host = (struct wbsd_host*)param;
u8 csr;
+ int delay = -1;
spin_lock(&host->lock);
@@ -1155,16 +1156,8 @@ static void wbsd_tasklet_card(unsigned long param)
DBG("Card inserted\n");
host->flags |= WBSD_FCARD_PRESENT;
- spin_unlock(&host->lock);
-
- /*
- * Delay card detection to allow electrical connections
- * to stabilise.
- */
- mmc_detect_change(host->mmc, msecs_to_jiffies(500));
+ delay = 500;
}
- else
- spin_unlock(&host->lock);
}
else if (host->flags & WBSD_FCARD_PRESENT)
{
@@ -1181,15 +1174,17 @@ static void wbsd_tasklet_card(unsigned long param)
tasklet_schedule(&host->finish_tasklet);
}
- /*
- * Unlock first since we might get a call back.
- */
- spin_unlock(&host->lock);
-
- mmc_detect_change(host->mmc, 0);
+ delay = 0;
}
- else
- spin_unlock(&host->lock);
+
+ /*
+ * Unlock first since we might get a call back.
+ */
+
+ spin_unlock(&host->lock);
+
+ if (delay != -1)
+ mmc_detect_change(host->mmc, msecs_to_jiffies(delay));
}
static void wbsd_tasklet_fifo(unsigned long param)