summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Levitsky2010-06-02 15:01:47 +0200
committerDavid Woodhouse2010-06-02 16:35:31 +0200
commitac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9 (patch)
tree7a91978426ae35a0225a8a6324e2237377b7a2c7
parentmtd/r852: Fixes in case of DMA timeout (diff)
downloadkernel-qcow2-linux-ac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9.tar.gz
kernel-qcow2-linux-ac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9.tar.xz
kernel-qcow2-linux-ac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9.zip
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@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/r852.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 3f219e61df7d..bcfc851fe550 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);
}