From: Fabio Estevam Date: Sat, 5 Nov 2016 19:45:07 +0000 (-0200) Subject: mmc: mxs: Initialize the spinlock prior to using it X-Git-Tag: v3.16.40~94 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd9e47dc4a69d2dc7f1f7e7be3f40991b2a89ae2;p=thirdparty%2Fkernel%2Fstable.git mmc: mxs: Initialize the spinlock prior to using it commit f91346e8b5f46aaf12f1df26e87140584ffd1b3f upstream. An interrupt may occur right after devm_request_irq() is called and prior to the spinlock initialization, leading to a kernel oops, as the interrupt handler uses the spinlock. In order to prevent this problem, move the spinlock initialization prior to requesting the interrupts. Fixes: e4243f13d10e (mmc: mxs-mmc: add mmc host driver for i.MX23/28) Signed-off-by: Fabio Estevam Reviewed-by: Marek Vasut Signed-off-by: Ulf Hansson [bwh: Backported to 3.16 adjust context] Signed-off-by: Ben Hutchings --- diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index babfea03ba8a0..ad32f235bdb86 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -658,13 +658,13 @@ static int mxs_mmc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mmc); + spin_lock_init(&host->lock); + ret = devm_request_irq(&pdev->dev, irq_err, mxs_mmc_irq_handler, 0, DRIVER_NAME, host); if (ret) goto out_free_dma; - spin_lock_init(&host->lock); - ret = mmc_add_host(mmc); if (ret) goto out_free_dma;