| Message ID | 20211130132309.18246-1-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: renesas_sdhi: initialize variable properly when tuning | expand |
On Tue, 30 Nov 2021 at 14:23, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > 'cmd_error' is not necessarily initialized on some error paths in > mmc_send_tuning(). Initialize it. > > Fixes: 2c9017d0b5d3 ("mmc: renesas_sdhi: abort tuning when timeout detected") > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Applied for fixes, thanks! Kind regards Uffe > --- > > Tested on a Salvator-XS (R-Car M3N), tuning still works. > > Ulf, this is a bugfix, can you take it via your tree for this cycle > please? > > drivers/mmc/host/renesas_sdhi_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c > index a4407f391f66..f5b2684ad805 100644 > --- a/drivers/mmc/host/renesas_sdhi_core.c > +++ b/drivers/mmc/host/renesas_sdhi_core.c > @@ -673,7 +673,7 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode) > > /* Issue CMD19 twice for each tap */ > for (i = 0; i < 2 * priv->tap_num; i++) { > - int cmd_error; > + int cmd_error = 0; > > /* Set sampling clock position */ > sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, i % priv->tap_num); > -- > 2.30.2 >
On Wed, Dec 1, 2021 at 7:43 AM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > 'cmd_error' is not necessarily initialized on some error paths in > mmc_send_tuning(). Initialize it. > > Fixes: 2c9017d0b5d3 ("mmc: renesas_sdhi: abort tuning when timeout detected") > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index a4407f391f66..f5b2684ad805 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -673,7 +673,7 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode) /* Issue CMD19 twice for each tap */ for (i = 0; i < 2 * priv->tap_num; i++) { - int cmd_error; + int cmd_error = 0; /* Set sampling clock position */ sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, i % priv->tap_num);
'cmd_error' is not necessarily initialized on some error paths in mmc_send_tuning(). Initialize it. Fixes: 2c9017d0b5d3 ("mmc: renesas_sdhi: abort tuning when timeout detected") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- Tested on a Salvator-XS (R-Car M3N), tuning still works. Ulf, this is a bugfix, can you take it via your tree for this cycle please? drivers/mmc/host/renesas_sdhi_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)