* [merged] omap-hsmmc-fix-a-bug-in-card-remove-scenario.patch removed from -mm tree
@ 2010-04-07 15:49 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2010-04-07 15:49 UTC (permalink / raw)
To: madhu.cr, adrian.hunter, linux-mmc, mm-commits
The patch titled
omap hsmmc: fix a bug in card remove scenario
has been removed from the -mm tree. Its filename was
omap-hsmmc-fix-a-bug-in-card-remove-scenario.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: omap hsmmc: fix a bug in card remove scenario
From: Madhusudhan Chikkature <madhu.cr@ti.com>
The reset of data lines when the card is removed from the cage results in
a failure.The failure is seen if the card is removed from the cage when TC
is pending after a CMD with data received CC.The reset logic leaves the
controller in a state where niether a TC is received nor DTO.
The rest code can be safely removed here since it is taken care in the IRQ
handler.
Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/mmc/host/omap_hsmmc.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff -puN drivers/mmc/host/omap_hsmmc.c~omap-hsmmc-fix-a-bug-in-card-remove-scenario drivers/mmc/host/omap_hsmmc.c
--- a/drivers/mmc/host/omap_hsmmc.c~omap-hsmmc-fix-a-bug-in-card-remove-scenario
+++ a/drivers/mmc/host/omap_hsmmc.c
@@ -1179,15 +1179,10 @@ static void omap_hsmmc_detect(struct wor
carddetect = -ENOSYS;
}
- if (carddetect) {
+ if (carddetect)
mmc_detect_change(host->mmc, (HZ * 200) / 1000);
- } else {
- mmc_host_enable(host->mmc);
- omap_hsmmc_reset_controller_fsm(host, SRD);
- mmc_host_lazy_disable(host->mmc);
^ permalink raw reply [flat|nested] 2+ messages in thread
* [merged] omap-hsmmc-fix-a-bug-in-card-remove-scenario.patch removed from -mm tree
@ 2010-04-07 15:49 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2010-04-07 15:49 UTC (permalink / raw)
To: madhu.cr, adrian.hunter, linux-mmc, mm-commits
The patch titled
omap hsmmc: fix a bug in card remove scenario
has been removed from the -mm tree. Its filename was
omap-hsmmc-fix-a-bug-in-card-remove-scenario.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: omap hsmmc: fix a bug in card remove scenario
From: Madhusudhan Chikkature <madhu.cr@ti.com>
The reset of data lines when the card is removed from the cage results in
a failure.The failure is seen if the card is removed from the cage when TC
is pending after a CMD with data received CC.The reset logic leaves the
controller in a state where niether a TC is received nor DTO.
The rest code can be safely removed here since it is taken care in the IRQ
handler.
Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/mmc/host/omap_hsmmc.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff -puN drivers/mmc/host/omap_hsmmc.c~omap-hsmmc-fix-a-bug-in-card-remove-scenario drivers/mmc/host/omap_hsmmc.c
--- a/drivers/mmc/host/omap_hsmmc.c~omap-hsmmc-fix-a-bug-in-card-remove-scenario
+++ a/drivers/mmc/host/omap_hsmmc.c
@@ -1179,15 +1179,10 @@ static void omap_hsmmc_detect(struct wor
carddetect = -ENOSYS;
}
- if (carddetect) {
+ if (carddetect)
mmc_detect_change(host->mmc, (HZ * 200) / 1000);
- } else {
- mmc_host_enable(host->mmc);
- omap_hsmmc_reset_controller_fsm(host, SRD);
- mmc_host_lazy_disable(host->mmc);
-
+ else
mmc_detect_change(host->mmc, (HZ * 50) / 1000);
- }
}
/*
_
Patches currently in -mm which might be from madhu.cr@ti.com are
origin.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-07 18:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-07 15:49 [merged] omap-hsmmc-fix-a-bug-in-card-remove-scenario.patch removed from -mm tree akpm
2010-04-07 15:49 akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.