| Message ID | d4f41babadf6dcab3520d25c658b93c49d10f64d.1520520655.git-series.maxime.ripard@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 8 March 2018 at 15:52, Maxime Ripard <maxime.ripard@bootlin.com> wrote: > As soon as the pm_runtime_enable hook is called, our runtime_suspend and > runtime_resume hooks can be called as well. However, we only set the device > drvdata that we will use after we have registered into the MMC core. Move > that earlier so that we don't have a race that could lead to a crash. > > Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sunxi-mmc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c > index c6431f6e816f..f6374066081b 100644 > --- a/drivers/mmc/host/sunxi-mmc.c > +++ b/drivers/mmc/host/sunxi-mmc.c > @@ -1336,6 +1336,7 @@ static int sunxi_mmc_probe(struct platform_device *pdev) > dev_err(&pdev->dev, "mmc alloc host failed\n"); > return -ENOMEM; > } > + platform_set_drvdata(pdev, mmc); > > host = mmc_priv(mmc); > host->dev = &pdev->dev; > @@ -1402,7 +1403,6 @@ static int sunxi_mmc_probe(struct platform_device *pdev) > goto error_free_dma; > > dev_info(&pdev->dev, "base:0x%p irq:%u\n", host->reg_base, host->irq); > - platform_set_drvdata(pdev, mmc); > return 0; > > error_free_dma: > -- > git-series 0.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index c6431f6e816f..f6374066081b 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1336,6 +1336,7 @@ static int sunxi_mmc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "mmc alloc host failed\n"); return -ENOMEM; } + platform_set_drvdata(pdev, mmc); host = mmc_priv(mmc); host->dev = &pdev->dev; @@ -1402,7 +1403,6 @@ static int sunxi_mmc_probe(struct platform_device *pdev) goto error_free_dma; dev_info(&pdev->dev, "base:0x%p irq:%u\n", host->reg_base, host->irq); - platform_set_drvdata(pdev, mmc); return 0; error_free_dma:
As soon as the pm_runtime_enable hook is called, our runtime_suspend and runtime_resume hooks can be called as well. However, we only set the device drvdata that we will use after we have registered into the MMC core. Move that earlier so that we don't have a race that could lead to a crash. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> --- drivers/mmc/host/sunxi-mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)