[PATCH 5/8] mmc: sdhci-of-aspeed: Fix null pointer
Cool Lee
cool_lee at aspeedtech.com
Fri Jun 20 01:18:58 PDT 2025
> > Platform data might be null.
>
> Currently it can't be:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers
> /mmc/host/sdhci-of-aspeed.c?h=v6.16-rc2#n375
>
> Are there future circumstances where it may be NULL?
>
> I'm all for reducing the reasoning from global to local, but I think some
> discussion in the commit message would be good.
Ok, you're right. I'll remove this.
I'm just considering when adding a new platform AST2700 which doesn't have a data, but missed there is a pre-check here.
>
> >
> > Signed-off-by: Cool Lee <cool_lee at aspeedtech.com>
> > ---
> > drivers/mmc/host/sdhci-of-aspeed.c | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sdhci-of-aspeed.c
> > b/drivers/mmc/host/sdhci-of-aspeed.c
> > index 2bdd93a3f91f..22dde915e51b 100644
> > --- a/drivers/mmc/host/sdhci-of-aspeed.c
> > +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> > @@ -241,7 +241,7 @@ static void aspeed_sdhci_set_clock(struct
> > sdhci_host *host, unsigned int clock)
> > struct sdhci_pltfm_host *pltfm_host;
> > unsigned long parent, bus;
> > struct aspeed_sdhci *sdhci;
> > - int div;
> > + int div = 1;
> > u16 clk;
> >
> > pltfm_host = sdhci_priv(host); @@ -257,6 +257,9 @@ static
> void
> > aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
> > if (WARN_ON(clock > host->max_clk))
> > clock = host->max_clk;
> >
> > + if (sdhci->pdata)
>
> Given this shouldn't be the case, perhaps precede it with a
> WARN_ONCE(!sdhci->pdata)?
Agreed.
>
> Andrew
>
> > + div = sdhci->pdata->clk_div_start;
> > +
> > /*
> > * Regarding the AST2600:
> > *
> > @@ -273,7 +276,7 @@ static void aspeed_sdhci_set_clock(struct
> > sdhci_host *host, unsigned int clock)
> > * supporting the value 0 in (EMMC12C[7:6], EMMC12C[15:8]),
> > and capture
> > * the 0-value capability in clk_div_start.
> > */
> > - for (div = sdhci->pdata->clk_div_start; div < 256; div *= 2) {
> > + for (; div < 256; div *= 2) {
> > bus = parent / div;
> > if (bus <= clock)
> > break;
More information about the linux-arm-kernel
mailing list