iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi-linus

Browse Source
This commit is contained in:
Mark Brown 2015-10-07 11:43:39 +01:00
commit c2c80bdb9e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/spi/sh-msiof.txt
View File

@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings:
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words - renesas,tx-fifo-size : Overrides the default tx fifo size given in words
(default is 64) (default is 64)
- renesas,rx-fifo-size : Overrides the default rx fifo size given in words - renesas,rx-fifo-size : Overrides the default rx fifo size given in words
(default is 64, or 256 on R-Car Gen2) (default is 64)
Pinctrl properties might be needed, too. See Pinctrl properties might be needed, too. See
Documentation/devicetree/bindings/pinctrl/renesas,*. Documentation/devicetree/bindings/pinctrl/renesas,*.

7
drivers/spi/spi-davinci.c
View File

@ -992,11 +992,12 @@ static int davinci_spi_probe(struct platform_device *pdev)
goto free_master; goto free_master;
} }
dspi->irq = platform_get_irq(pdev, 0); ret = platform_get_irq(pdev, 0);
if (dspi->irq <= 0) { if (ret == 0)
ret = -EINVAL; ret = -EINVAL;
if (ret < 0)
goto free_master; goto free_master;
} dspi->irq = ret;
ret = devm_request_threaded_irq(&pdev->dev, dspi->irq, davinci_spi_irq, ret = devm_request_threaded_irq(&pdev->dev, dspi->irq, davinci_spi_irq,
dummy_thread_fn, 0, dev_name(&pdev->dev), dspi); dummy_thread_fn, 0, dev_name(&pdev->dev), dspi);