[PATCH v7 9/9] net-next: mvpp2: don't shadow error
From: Matti Vaittinen <mazziesaccount@gmail.com>
Date: 2023-05-29 06:26:10
Also in:
linux-acpi, linux-gpio, linux-i2c, linux-iio, linux-mips, lkml
Subsystem:
marvell mvpp2 ethernet driver, networking drivers, the rest · Maintainers:
Marcin Wojtas, Russell King, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Do not overwrite error from lower layers but return the actual error to
user if obtaining an IRQ fails.
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Suggested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
---
Revision history:
v7: New patch
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 5b987af306a5..57cacdcd49ea 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -5830,13 +5830,13 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port,
}
if (port_node)
- v->irq = of_irq_get_byname(port_node, irqname);
+ ret = of_irq_get_byname(port_node, irqname);
else
- v->irq = fwnode_irq_get(port->fwnode, i);
- if (v->irq < 0) {
- ret = -EINVAL;
+ ret = fwnode_irq_get(port->fwnode, i);
+ if (ret < 0)
goto err;
- }
+
+ v->irq = ret;
netif_napi_add(port->dev, &v->napi, mvpp2_poll);
}--
2.40.1
--
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND
~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =]