Commit 916a9140 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.5-memory-fixes' of... 

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/20191204130753.3614278-1-thierry.reding@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5af5b2ae 030d2829

drivers/memory/tegra/tegra30-emc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);