From: Maxime Ripard Date: Thu, 8 Mar 2018 14:52:53 +0000 (+0100) Subject: mmc: sunxi: Set our device drvdata earlier X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cb1214d27a3ef8817a7a208d546aa9f947bf5f7d;p=linux.git mmc: sunxi: Set our device drvdata earlier 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 Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index b747d65a7d156..20cfb20418f3e 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1318,6 +1318,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; @@ -1384,7 +1385,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: