diff options
| author | Olof Johansson <olof@lixom.net> | 2019-12-06 08:28:49 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-12-06 08:28:51 -0800 |
| commit | 916a9140627898f1f3feb220b8e77001c0d876bf (patch) | |
| tree | b36924d104214c24a5f6162b05f91fa0eecb82cf | |
| parent | 5af5b2ae1ccfb4638c885e16cb0dfe131cb4aa9b (diff) | |
| parent | 030d2829f4c22e675e21904f32ab60f659174e72 (diff) | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/memory/tegra/tegra30-emc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c index 6929980bf907..0b6a5e451ea3 100644 --- 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); |