Skip to content

Commit 8b45e9d

Browse files
committed
Merge tag 'soc-fsl-fix-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes
NXP/FSL soc driver fixes for v5.6 DPAA2 DPIO - Fix a kernel hang caused by irq requested before creating dpio * tag 'soc-fsl-fix-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux: soc: fsl: dpio: register dpio irq handlers after dpio create Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 2c523b3 + fe8fe77 commit 8b45e9d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/soc/fsl/dpio/dpio-driver.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,17 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev)
233233
goto err_allocate_irqs;
234234
}
235235

236-
err = register_dpio_irq_handlers(dpio_dev, desc.cpu);
237-
if (err)
238-
goto err_register_dpio_irq;
239-
240236
priv->io = dpaa2_io_create(&desc, dev);
241237
if (!priv->io) {
242238
dev_err(dev, "dpaa2_io_create failed\n");
243239
err = -ENOMEM;
244240
goto err_dpaa2_io_create;
245241
}
246242

243+
err = register_dpio_irq_handlers(dpio_dev, desc.cpu);
244+
if (err)
245+
goto err_register_dpio_irq;
246+
247247
dev_info(dev, "probed\n");
248248
dev_dbg(dev, " receives_notifications = %d\n",
249249
desc.receives_notifications);

0 commit comments

Comments
 (0)