diff mbox series

[v7,9/9] net-next: mvpp2: don't shadow error

Message ID 16d2b244566d4993c8fb26e1e2fbd178f46587f4.1685340157.git.mazziesaccount@gmail.com
State New
Headers show
Series fix fwnode_irq_get[_byname()] returnvalue | expand

Commit Message

Matti Vaittinen May 29, 2023, 6:25 a.m. UTC
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 mbox series

Patch

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);
 	}