On 17 August 2016 at 19:34, <robert.foss@xxxxxxxxxxxxx> wrote: > From: Christopher Freeman <cfreeman@xxxxxxxxxx> > > wait_event_interruptible_timeout() will return early if the blocked > process receives a signal, causing the driver to abort the tuning > procedure and possibly leaving the controller in a bad state. Since the > tuning command is expected to complete quickly (<50ms) and we've set a > timeout, use wait_event_timeout() instead. > > Signed-off-by: Christopher Freeman <cfreeman@xxxxxxxxxx> > Tested-by: Robert Foss <robert.foss@xxxxxxxxxxxxx> > Signed-off-by: Robert Foss <robert.foss@xxxxxxxxxxxxx> > Reviewed-by: Benson Leung <bleung@xxxxxxxxxxxx> > Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Thanks, applied for next! Kind regards Uffe > --- > > Changes since v1: > - Added proper metadata tags to series. > > Changes since v2: > - Added "Reviewed-by: Benson Leung <bleung@xxxxxxxxxxxx>" > > Changes since v3: > - Added "Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>" > > drivers/mmc/host/sdhci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 0e3d7c0..9e80203 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -1960,7 +1960,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) > > spin_unlock_irqrestore(&host->lock, flags); > /* Wait for Buffer Read Ready interrupt */ > - wait_event_interruptible_timeout(host->buf_ready_int, > + wait_event_timeout(host->buf_ready_int, > (host->tuning_done == 1), > msecs_to_jiffies(50)); > spin_lock_irqsave(&host->lock, flags); > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
