memory: tegra30-emc: Fix panic on suspend

digetx · thierryreding · commit 030d2829f4c2 · 2019-11-18T13:54:40.000+01:00
Trying to suspend driver results in a crash if timings aren't available in device-tree. Reported-by: Jon Hunter <jonathanh@nvidia.com> Fixes: e34212c ("memory: tegra: Introduce Tegra30 EMC driver") Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
@@ -1093,7 +1093,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
 	if (of_get_child_count(pdev->dev.of_node) == 0) {
 		dev_info(&pdev->dev,
 			 "device-tree node doesn't have memory timings\n");
-		return 0;
+		return -ENODEV;
 	}
 
 	np = of_parse_phandle(pdev->dev.of_node, "nvidia,memory-controller", 0);

Original file line number	Diff line number	Diff line change
`@@ -1093,7 +1093,7 @@ static int tegra_emc_probe(struct platform_device *pdev)`
`1093`	`1093`	`if (of_get_child_count(pdev->dev.of_node) == 0) {`
`1094`	`1094`	`dev_info(&pdev->dev,`
`1095`	`1095`	`"device-tree node doesn't have memory timings\n");`
`1096`		`- return 0;`
	`1096`	`+ return -ENODEV;`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`	`1099`	`np = of_parse_phandle(pdev->dev.of_node, "nvidia,memory-controller", 0);`