diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 15:40:21 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 15:40:22 +0300 |
| commit | 8b45e9d9c05df5d7eb4ed460534fc554751505df (patch) | |
| tree | ff209ecccb752d9b168db4aa0d99ae31198e10b1 /drivers/soc | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| parent | fe8fe7723a3a824790bda681b40efd767e2251a7 (diff) | |
| download | linux-8b45e9d9c05df5d7eb4ed460534fc554751505df.tar.xz | |
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/20200312202525.16708-1-leoyang.li@nxp.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/fsl/dpio/dpio-driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/soc/fsl/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c index 70014ecce2a7..7b642c330977 100644 --- a/drivers/soc/fsl/dpio/dpio-driver.c +++ b/drivers/soc/fsl/dpio/dpio-driver.c @@ -233,10 +233,6 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) goto err_allocate_irqs; } - err = register_dpio_irq_handlers(dpio_dev, desc.cpu); - if (err) - goto err_register_dpio_irq; - priv->io = dpaa2_io_create(&desc, dev); if (!priv->io) { dev_err(dev, "dpaa2_io_create failed\n"); @@ -244,6 +240,10 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) goto err_dpaa2_io_create; } + err = register_dpio_irq_handlers(dpio_dev, desc.cpu); + if (err) + goto err_register_dpio_irq; + dev_info(dev, "probed\n"); dev_dbg(dev, " receives_notifications = %d\n", desc.receives_notifications); |