[PATCH v8 8/8] net-next: mvpp2: don't shadow error

From: Matti Vaittinen
Date: Tue Aug 01 2023 - 08:05:28 EST


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@xxxxxxxxxxxxxxx>
Suggested-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Signed-off-by: Matti Vaittinen <mazziesaccount@xxxxxxxxx>
---
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 2632ffe91ca5..2aba34a2ca76 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 =]

Attachment: signature.asc
Description: PGP signature