The patch titled
mmc: in mmc_power_up(), use previously selected ocr if available
has been added to the -mm tree. Its filename is
mmc-in-mmc_power_up-use-previously-selected-ocr-if-available.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mmc: in mmc_power_up(), use previously selected ocr if available
From: Balaji Rao <balajirrao@xxxxxxxxxxxx>
When mmc_power_up is called during unsafe resume, host->ocr should be used
instead of host->ocr_avail.
Signed-off-by: Balaji Rao <balajirrao@xxxxxxxxxxxx>
Cc: Andy Green <andy@xxxxxxxxxxxx>
Cc: Pierre Ossman <drzeus-mmc@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/core/core.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/mmc/core/core.c~mmc-in-mmc_power_up-use-previously-selected-ocr-if-available drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c~mmc-in-mmc_power_up-use-previously-selected-ocr-if-available
+++ a/drivers/mmc/core/core.c
@@ -572,7 +572,13 @@ void mmc_set_timing(struct mmc_host *hos
*/
static void mmc_power_up(struct mmc_host *host)
{
- int bit = fls(host->ocr_avail) - 1;
+ int bit;
+
+ /* If ocr is set, we use it */
+ if (host->ocr)
+ bit = ffs(host->ocr) - 1;
+ else
+ bit = fls(host->ocr_avail) - 1;
host->ios.vdd = bit;
if (mmc_host_is_spi(host)) {
_
Patches currently in -mm which might be from balajirrao@xxxxxxxxxxxx are
mfd-pcf50633-terminate-i2c_device_id-list.patch
linux-next.patch
mmc-in-mmc_power_up-use-previously-selected-ocr-if-available.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
