diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-03-08 16:50:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-03-08 16:50:18 +0100 |
| commit | 608f7cf3f54415963ef49b70596153d806ebb0de (patch) | |
| tree | fb3399509fbec597d36d579a162a9a32ef281b5e /drivers/memory | |
| parent | d3d009847a119db499094aca61bd8a9935bc94ef (diff) | |
| parent | 69d6941949ea8a113ffc89410b0cb79bc7b35a0b (diff) | |
| download | linux-608f7cf3f54415963ef49b70596153d806ebb0de.tar.gz | |
Merge tag 'memory-controller-drv-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.18, part two
1. TI: Two fixes for TI EMIF driver for quite old error path issues (so
for unlikely scenarios).
2. Renesas: Document RZ/V2L SoC in bindings.
* tag 'memory-controller-drv-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
dt-bindings: memory: renesas,rpc-if: Document RZ/V2L SoC
memory: emif: check the pointer temp in get_device_details()
memory: emif: Add check for setup_interrupts
Link: https://lore.kernel.org/r/20220307082552.55719-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/emif.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 762d0c0f0716f..ecc78d6f89ed2 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -1025,7 +1025,7 @@ static struct emif_data *__init_or_module get_device_details( temp = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL); dev_info = devm_kzalloc(dev, sizeof(*dev_info), GFP_KERNEL); - if (!emif || !pd || !dev_info) { + if (!emif || !temp || !dev_info) { dev_err(dev, "%s:%d: allocation error\n", __func__, __LINE__); goto error; } @@ -1117,7 +1117,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) { struct emif_data *emif; struct resource *res; - int irq; + int irq, ret; if (pdev->dev.of_node) emif = of_get_memory_device_details(pdev->dev.of_node, &pdev->dev); @@ -1147,7 +1147,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev) emif_onetime_settings(emif); emif_debugfs_init(emif); disable_and_clear_all_interrupts(emif); - setup_interrupts(emif, irq); + ret = setup_interrupts(emif, irq); + if (ret) + goto error; /* One-time actions taken on probing the first device */ if (!emif1) { |