Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=29041dbe199b0dff392bf1b9d634357da0b3208f
Commit: 29041dbe199b0dff392bf1b9d634357da0b3208f
Parent: f74d132cec60b686bce1f284822c1a496700bd3c
Author: Pierre Ossman <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 10 15:52:23 2007 +0100
Committer: Pierre Ossman <[EMAIL PROTECTED]>
CommitDate: Tue May 1 13:04:16 2007 +0200
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 <[EMAIL PROTECTED]>
---
drivers/mmc/mmc.c | 2 --
drivers/mmc/mmc_sysfs.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ccd3037..9ffeeb2 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 e0e82d8..06f264b 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;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
