diff options
| author | Mark Brown <[email protected]> | 2019-09-15 09:32:04 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2019-09-15 09:32:04 +0000 |
| commit | 262a2f33454fcecdc2032ca84d6fecdb08233468 (patch) | |
| tree | 0689eaf3ef298f1ebd62db89a6c19680e5eb479c /drivers/spi/spi-fsl-dspi.c | |
| parent | Linux 5.3-rc8 (diff) | |
| parent | spi: bcm2835: Work around DONE bit erratum (diff) | |
| download | kernel-262a2f33454fcecdc2032ca84d6fecdb08233468.tar.gz kernel-262a2f33454fcecdc2032ca84d6fecdb08233468.zip | |
Merge branch 'spi-5.3' into spi-linus
Diffstat (limited to 'drivers/spi/spi-fsl-dspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 53335ccc98f6..545fc8189fb0 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -886,9 +886,11 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id) trans_mode); } } + + return IRQ_HANDLED; } - return IRQ_HANDLED; + return IRQ_NONE; } static const struct of_device_id fsl_dspi_dt_ids[] = { |
