diff options
author | Maxim Levitsky <maximlevitsky@gmail.com> | 2010-06-02 09:01:47 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-06-02 10:35:31 -0400 |
commit | ac373f7e2286ed3690e8a93ebf9f6f1ae0c7d4a9 (patch) | |
tree | 7a91978426ae35a0225a8a6324e2237377b7a2c7 /drivers/mtd | |
parent | 9489be8ca234c07666e88a4472e4d5f2a2425aa5 (diff) |
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>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | 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 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) | |||
712 | container_of(work, struct r852_device, card_detect_work.work); | 712 | container_of(work, struct r852_device, card_detect_work.work); |
713 | 713 | ||
714 | r852_card_update_present(dev); | 714 | r852_card_update_present(dev); |
715 | r852_update_card_detect(dev); | ||
715 | dev->card_unstable = 0; | 716 | dev->card_unstable = 0; |
716 | 717 | ||
717 | /* False alarm */ | 718 | /* False alarm */ |
@@ -727,7 +728,6 @@ void r852_card_detect_work(struct work_struct *work) | |||
727 | else | 728 | else |
728 | r852_unregister_nand_device(dev); | 729 | r852_unregister_nand_device(dev); |
729 | exit: | 730 | exit: |
730 | /* Update detection logic */ | ||
731 | r852_update_card_detect(dev); | 731 | r852_update_card_detect(dev); |
732 | } | 732 | } |
733 | 733 | ||