diff options
| author | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
| commit | b1630da0589dbf520e4cf565eda6a74c5a813962 (patch) | |
| tree | 290df4d4e49d96ed4df1dfa68ead45991e85cd2e /drivers/spi | |
| parent | USB: u132-hcd: Fix seperate word in printk message (diff) | |
| parent | Linux 4.3-rc5 (diff) | |
| download | kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.gz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.xz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.zip | |
Merge 4.3-rc5 into usb-next
We want the USB fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 3cf9faa6cc3f..a85d863d4a44 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -992,11 +992,12 @@ static int davinci_spi_probe(struct platform_device *pdev) goto free_master; } - dspi->irq = platform_get_irq(pdev, 0); - if (dspi->irq <= 0) { + ret = platform_get_irq(pdev, 0); + if (ret == 0) ret = -EINVAL; + if (ret < 0) goto free_master; - } + dspi->irq = ret; ret = devm_request_threaded_irq(&pdev->dev, dspi->irq, davinci_spi_irq, dummy_thread_fn, 0, dev_name(&pdev->dev), dspi); |