mmc: Move "present" marking

The "present" state indicates that the card is a registered device, so
it is more clear to put it together with the actual registration.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ccd3037da249..9ffeeb2cba45 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1604,8 +1604,6 @@ static void mmc_rescan(struct work_struct *work)
                 if (!mmc_card_present(card) && !mmc_card_dead(card)) {
                         if (mmc_register_card(card))
                                 mmc_card_set_dead(card);
-                        else
-                                mmc_card_set_present(card);
                 }
 
                 /*
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
index e0e82d849d5f..06f264b2f79c 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -217,6 +217,8 @@ int mmc_register_card(struct mmc_card *card)
                                 device_del(&card->dev);
                 }
         }
+        if (ret == 0)
+                mmc_card_set_present(card);
         return ret;
 }