[PATCH -next] ARM: OMAP2+: omap_device: fix error return code in omap_device_copy_resources()
Wei Yongjun
weiyongjun1 at huawei.com
Fri Oct 13 02:29:25 PDT 2017
Fix to return error code -EINVAL from the irq_of_parse_and_map() error
handling case instead of 0, as done elsewhere in this function.
Fixes: d85a2d61432a ("ARM: OMAP2+: Populate legacy resources for dma
and smartreflex")
Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
---
arch/arm/mach-omap2/omap_device.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index 713fc6b..d45cbfd 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -433,8 +433,10 @@ void omap_device_delete(struct omap_device *od)
irq = irq_of_parse_and_map(child, 0);
if (!irq)
irq = irq_of_parse_and_map(np, 0);
- if (!irq)
+ if (!irq) {
+ error = -EINVAL;
goto free;
+ }
/* Legacy DMA code needs interrupt name to be "0" */
res[1].start = irq;
More information about the linux-arm-kernel
mailing list