| Message ID | 20150127233524.32160.26896.stgit@notabene.brown (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index b8cc02b325c4..7162ada24a24 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -903,10 +903,11 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort) spin_lock_irqsave(&host->lock, flags); } set_current_state(TASK_RUNNING); - if (!stop) { + if (!host->claimed || host->claimer == current) { host->claimed = 1; host->claimer = current; host->claim_cnt += 1; + stop = 0; } else wake_up(&host->wq); spin_unlock_irqrestore(&host->lock, flags);
Change the handling for the 'abort' flag so that if it is set, but we can claim the host, the do the claim, rather than aborting. When the abort is async this just means that a race between aborting an allowing a claim is resolved slightly differently. Any code must already be able to handle 'abort' being set just as the host is claimed. This allows extra functionality. If __mmc_claim_host() is called with an 'abort' point which is initialized to '1', it will effect a non-blocking 'claim'. Signed-off-by: NeilBrown <neil@brown.name> --- drivers/mmc/core/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html