Skip to content

Commit 916a914

Browse files
committed
Merge tag 'tegra-for-5.5-memory-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes
memory: tegra: Fixes for v5.5-rc1 This contains a fix for a kernel panic that can occur on suspend if EMC timings are not available in device tree. * tag 'tegra-for-5.5-memory-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: memory: tegra30-emc: Fix panic on suspend Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 5af5b2a + 030d282 commit 916a914

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/memory/tegra/tegra30-emc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
10931093
if (of_get_child_count(pdev->dev.of_node) == 0) {
10941094
dev_info(&pdev->dev,
10951095
"device-tree node doesn't have memory timings\n");
1096-
return 0;
1096+
return -ENODEV;
10971097
}
10981098

10991099
np = of_parse_phandle(pdev->dev.of_node, "nvidia,memory-controller", 0);

0 commit comments

Comments
 (0)