From: Sachin Kamat Date: Tue, 25 Feb 2014 09:48:20 +0000 (+0530) Subject: mmc: wmt-sdmmc: Fix NULL pointer dereference X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=43aaa50f17c38c16cce2a9a3e73909b7937892a3;p=openwrt%2Fstaging%2Fblogic.git mmc: wmt-sdmmc: Fix NULL pointer dereference 'of_id' is dereferenced before NULL pointer check. Move it to after the check. Signed-off-by: Sachin Kamat Acked-by: Tony Prisk Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c index e902ed7846b0..498d1f799085 100644 --- a/drivers/mmc/host/wmt-sdmmc.c +++ b/drivers/mmc/host/wmt-sdmmc.c @@ -757,7 +757,7 @@ static int wmt_mci_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; const struct of_device_id *of_id = of_match_device(wmt_mci_dt_ids, &pdev->dev); - const struct wmt_mci_caps *wmt_caps = of_id->data; + const struct wmt_mci_caps *wmt_caps; int ret; int regular_irq, dma_irq; @@ -766,6 +766,8 @@ static int wmt_mci_probe(struct platform_device *pdev) return -EFAULT; } + wmt_caps = of_id->data; + if (!np) { dev_err(&pdev->dev, "Missing SDMMC description in devicetree\n"); return -EFAULT;