kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: sunxi: Fix NULL pointer reference on clk_delays

Browse source 
Some SoCs do not support clk delays for MMC in the clock control unit.
These include the old controllers in A10/A10s/A13/R8, and the new eMMC
controller in A64. The config structure for these controllers do not
specify clk_delays, but the check for this was replaced in change
"mmc: sunxi: Support controllers that can use both old and new timings".

This patch adds back the check for clk_delays, and also adds comments
for both checks in sunxi_mmc_clk_set_phase().

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Chen-Yu Tsai 2017-08-08 15:02:44 +08:00 committed by Ulf Hansson
parent ac98caefe1
commit a646113435
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/mmc/host/sunxi-mmc.c
View file

@ -722,9 +722,14 @@ static int sunxi_mmc_clk_set_phase(struct sunxi_mmc_host *host,
{ {
int index; int index;
/* clk controller delays not used under new timings mode */
if (host->use_new_timings) if (host->use_new_timings)
return 0; return 0;
/* some old controllers don't support delays */
if (!host->cfg->clk_delays)
return 0;
/* determine delays */ /* determine delays */
if (rate <= 400000) { if (rate <= 400000) {
index = SDXC_CLK_400K; index = SDXC_CLK_400K;