From: Frank Li Date: Tue, 30 Mar 2021 17:12:42 +0000 (-0500) Subject: LF-3647 arm: imx: fix coverity scan error X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~223 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=3f344da4cdac4141a196bd689df6d8fd9be13e14;p=linux.git LF-3647 arm: imx: fix coverity scan error of_match_device may return null but of_id have not been checked in imx_mmdc_perf_init pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data; Signed-off-by: Frank Li --- diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c index 8599936fc001..1ca7d2887fd0 100644 --- a/arch/arm/mach-imx/mmdc.c +++ b/arch/arm/mach-imx/mmdc.c @@ -103,7 +103,7 @@ struct mmdc_pmu { struct device *dev; struct perf_event *mmdc_events[MMDC_NUM_COUNTERS]; struct hlist_node node; - struct fsl_mmdc_devtype_data *devtype_data; + const struct fsl_mmdc_devtype_data *devtype_data; }; /* @@ -501,7 +501,9 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "mmdc%d", mmdc_num); - pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data; + pmu_mmdc->devtype_data = &imx6q_data; + if (of_id) + pmu_mmdc->devtype_data = of_id->data; hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);