mtd/r852: update card detect early.

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=ac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9
Commit:     ac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9
Parent:     9489be8ca234c07666e88a4472e4d5f2a2425aa5
Author:     Maxim Levitsky <maximlevitsky at gmail.com>
AuthorDate: Wed Jun 2 16:01:47 2010 +0300
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed Jun 2 15:35:31 2010 +0100

    mtd/r852: update card detect early.
    
    This turns out to be the reason for DMA timeouts on resume,
    if card was inserted while system was suspended
    
    Signed-off-by: Maxim Levitsky <maximlevitsky at gmail.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/r852.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 3f219e6..bcfc851 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -712,6 +712,7 @@ void r852_card_detect_work(struct work_struct *work)
 		container_of(work, struct r852_device, card_detect_work.work);
 
 	r852_card_update_present(dev);
+	r852_update_card_detect(dev);
 	dev->card_unstable = 0;
 
 	/* False alarm */
@@ -727,7 +728,6 @@ void r852_card_detect_work(struct work_struct *work)
 	else
 		r852_unregister_nand_device(dev);
 exit:
-	/* Update detection logic */
 	r852_update_card_detect(dev);
 }