From: Kouichi Tomita Date: Sun, 15 Feb 2015 14:46:47 +0000 (+0900) Subject: mmc: sh_mmcif: Move dev_err() of mmcif_timeout_work() X-Git-Tag: v4.9.8~4496^2~46 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cbd52246533d1dc6449ef8278e95e5e0944a1e5;p=platform%2Fkernel%2Flinux-rpi3.git mmc: sh_mmcif: Move dev_err() of mmcif_timeout_work() If interruption of command already occurred, mrq pointer in dev_err() would refer to NULL, because the host-state is changed to STATE_IDLE and mrq pointer is changed to NULL by interrupt handler. Therefore dev_err is moved after checking STATE_IDLE. Signed-off-by: Kouichi Tomita Signed-off-by: Yoshihiro Kaneko Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 7d9d6a3..e075804 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1312,15 +1312,15 @@ static void mmcif_timeout_work(struct work_struct *work) /* Don't run after mmc_remove_host() */ return; - dev_err(&host->pd->dev, "Timeout waiting for %u on CMD%u\n", - host->wait_for, mrq->cmd->opcode); - spin_lock_irqsave(&host->lock, flags); if (host->state == STATE_IDLE) { spin_unlock_irqrestore(&host->lock, flags); return; } + dev_err(&host->pd->dev, "Timeout waiting for %u on CMD%u\n", + host->wait_for, mrq->cmd->opcode); + host->state = STATE_TIMEOUT; spin_unlock_irqrestore(&host->lock, flags);