[PATCH v1 3/5] gpiolib: Do not assign error pointer to the GPIO IRQ chip domain

From: Andy Shevchenko
Date: Wed Jun 21 2023 - 13:50:28 EST


Check domain for being an error pointer before assigning it to
the GPIO IRQ chip domain.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/gpio/gpiolib.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index fac1124d5016..0e40f9a44519 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1647,6 +1647,7 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,
{
struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);
struct irq_chip *irqchip = gc->irq.chip;
+ struct irq_domain *domain;
unsigned int type;
unsigned int i;

@@ -1679,14 +1680,13 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,

/* If a parent irqdomain is provided, let's build a hierarchy */
if (gpiochip_hierarchy_is_hierarchical(gc)) {
- gc->irq.domain = gpiochip_hierarchy_create_domain(gc);
- if (IS_ERR(gc->irq.domain))
- return PTR_ERR(gc->irq.domain);
+ domain = gpiochip_hierarchy_create_domain(gc);
} else {
- gc->irq.domain = gpiochip_simple_create_domain(gc);
- if (IS_ERR(gc->irq.domain))
- return PTR_ERR(gc->irq.domain);
+ domain = gpiochip_simple_create_domain(gc);
}
+ if (IS_ERR(domain))
+ return PTR_ERR(domain);
+ gc->irq.domain = domain;

if (gc->irq.parent_handler) {
for (i = 0; i < gc->irq.num_parents; i++) {
--
2.40.0.1.gaa8946217a0b