diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
| commit | b769c5ba8aedc395ed04abe6db84a556d28beec1 (patch) | |
| tree | dd00c955f899f65785d60c2b4673785c28054b30 /drivers/spi/spi-ti-qspi.c | |
| parent | 262a2f33454fcecdc2032ca84d6fecdb08233468 (diff) | |
| parent | fdeae8f5a2e5eb3fcc9c295bfb28503c3abd4d6e (diff) | |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-ti-qspi.c')
| -rw-r--r-- | drivers/spi/spi-ti-qspi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index 6ca600702470..3cb65371ae3b 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c | |||
| @@ -717,7 +717,6 @@ static int ti_qspi_probe(struct platform_device *pdev) | |||
| 717 | 717 | ||
| 718 | irq = platform_get_irq(pdev, 0); | 718 | irq = platform_get_irq(pdev, 0); |
| 719 | if (irq < 0) { | 719 | if (irq < 0) { |
| 720 | dev_err(&pdev->dev, "no irq resource?\n"); | ||
| 721 | ret = irq; | 720 | ret = irq; |
| 722 | goto free_master; | 721 | goto free_master; |
| 723 | } | 722 | } |