File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -1629,6 +1629,7 @@ static void sdhci_finish_data(struct sdhci_host *host)
16291629
16301630static bool sdhci_send_command (struct sdhci_host * host , struct mmc_command * cmd )
16311631{
1632+ const unsigned long default_timeout_secs = 5 ;
16321633 int flags ;
16331634 u32 mask ;
16341635 unsigned long timeout ;
@@ -1704,10 +1705,10 @@ static bool sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
17041705 timeout = jiffies ;
17051706 if (host -> data_timeout )
17061707 timeout += nsecs_to_jiffies (host -> data_timeout );
1707- else if (!cmd -> data && cmd -> busy_timeout > 9000 )
1708+ else if (!cmd -> data && cmd -> busy_timeout > ( default_timeout_secs - 1 ) * 1000 )
17081709 timeout += DIV_ROUND_UP (cmd -> busy_timeout , 1000 ) * HZ + HZ ;
17091710 else
1710- timeout += 10 * HZ ;
1711+ timeout += default_timeout_secs * HZ ;
17111712 sdhci_mod_timer (host , cmd -> mrq , timeout );
17121713
17131714 if (host -> use_external_dma )
You can’t perform that action at this time.
0 commit comments