History

mmc: mvsdio: Respect card busy time out from mmc core

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.

Ulf Hansson committed 8 years ago

Commit 0ef89ec1 parent 4ba9bf91 file · +3 −1Browse files

Unified · Split

drivers/mmc/host/mvsdio.c+3−1
@@ -143,6 +143,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq) · 142 unmodified lines
143143 struct mmc_command *cmd = mrq->cmd;
144144 u32 cmdreg = 0, xfer = 0, intr = 0;
145145 unsigned long flags;
146+ unsigned int timeout;
146147
147148 BUG_ON(host->mrq != NULL);
148149 host->mrq = mrq;
@@ -234,7 +235,8 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq) · 85 unmodified lines
234235 mvsd_write(MVSD_NOR_INTR_EN, host->intr_en);
235236 mvsd_write(MVSD_ERR_INTR_EN, 0xffff);
236237
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));
238240
239241 spin_unlock_irqrestore(&host->lock, flags);
240242 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t