diff options
Diffstat (limited to 'drivers/spi/spi-tegra20-sflash.c')
| -rw-r--r-- | drivers/spi/spi-tegra20-sflash.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index a841a7250d14..514429379206 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -341,10 +341,11 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master,  			goto exit;  		}  		msg->actual_length += xfer->len; -		if (xfer->cs_change && xfer->delay_usecs) { +		if (xfer->cs_change && +		    (xfer->delay_usecs || xfer->delay.value)) {  			tegra_sflash_writel(tsd, tsd->def_command_reg,  					SPI_COMMAND); -			udelay(xfer->delay_usecs); +			spi_transfer_delay_exec(xfer);  		}  	}  	ret = 0;  |