Instead of using a hardcoded timeout of 5 * HZ jiffies, let's respect the command busy timeout provided by the mmc core. This make the used timeout more reliable.
Unified · Split
| @@ -143,6 +143,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq) · 142 unmodified lines | ||
| 143 | 143 | struct mmc_command *cmd = mrq->cmd; |
| 144 | 144 | u32 cmdreg = 0, xfer = 0, intr = 0; |
| 145 | 145 | unsigned long flags; |
| 146 | + unsigned int timeout; | |
| 146 | 147 | |
| 147 | 148 | BUG_ON(host->mrq != NULL); |
| 148 | 149 | host->mrq = mrq; |
| @@ -234,7 +235,8 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq) · 85 unmodified lines | ||
| 234 | 235 | mvsd_write(MVSD_NOR_INTR_EN, host->intr_en); |
| 235 | 236 | mvsd_write(MVSD_ERR_INTR_EN, 0xffff); |
| 236 | 237 | |
| 237 | − mod_timer(&host->timer, jiffies + 5 * HZ); | |
| 238 | + timeout = cmd->busy_timeout ? cmd->busy_timeout : 5000; | |
| 239 | + mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout)); | |
| 238 | 240 | |
| 239 | 241 | spin_unlock_irqrestore(&host->lock, flags); |
| 240 | 242 | } |