On Fri, Mar 4, 2011 at 4:22 AM, Maxim Levitsky <maximlevit...@gmail.com> wrote:
> On Mon, 2010-12-20 at 00:11 +0200, Ohad Ben-Cohen wrote:
>> Hi Chris,
>>
>> On Fri, Dec 17, 2010 at 2:51 AM, Chris Ball <c...@laptop.org> wrote:
>> ...
>> > Thanks, pushed to mmc-next with trivial cleanup as below:
>>
>> Looks good, thanks.
>>
>> I just briefly tested mmc-next and it looks fine.
>
> This patch breaks the CONFIG_MMC_UNSAFE_RESUME

Does the below work for you (untested) ?

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 6625c05..150b5f3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1529,7 +1529,7 @@ void mmc_rescan(struct work_struct *work)
         * still present
         */
        if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
-           && mmc_card_is_removable(host))
+           && !(host->caps & MMC_CAP_NONREMOVABLE))
                host->bus_ops->detect(host);

        /*
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to