diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:04 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:04 -0400 |
commit | 262a2f33454fcecdc2032ca84d6fecdb08233468 (patch) | |
tree | 0689eaf3ef298f1ebd62db89a6c19680e5eb479c /drivers/spi/spi-fsl-dspi.c | |
parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
parent | 4c524191c0a21d758b519087c64f84348095e940 (diff) |
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) | |||
886 | trans_mode); | 886 | trans_mode); |
887 | } | 887 | } |
888 | } | 888 | } |
889 | |||
890 | return IRQ_HANDLED; | ||
889 | } | 891 | } |
890 | 892 | ||
891 | return IRQ_HANDLED; | 893 | return IRQ_NONE; |
892 | } | 894 | } |
893 | 895 | ||
894 | static const struct of_device_id fsl_dspi_dt_ids[] = { | 896 | static const struct of_device_id fsl_dspi_dt_ids[] = { |