tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi-linus
+5
-4
+1
-1
Documentation/devicetree/bindings/spi/sh-msiof.txt
+1
-1
Documentation/devicetree/bindings/spi/sh-msiof.txt
···
51
51
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words
52
52
(default is 64)
53
53
- renesas,rx-fifo-size : Overrides the default rx fifo size given in words
54
-
(default is 64, or 256 on R-Car Gen2)
54
+
(default is 64)
55
55
56
56
Pinctrl properties might be needed, too. See
57
57
Documentation/devicetree/bindings/pinctrl/renesas,*.
+4
-3
drivers/spi/spi-davinci.c
+4
-3
drivers/spi/spi-davinci.c
···
992
992
goto free_master;
993
993
}
994
994
995
-
dspi->irq = platform_get_irq(pdev, 0);
996
-
if (dspi->irq <= 0) {
995
+
ret = platform_get_irq(pdev, 0);
996
+
if (ret == 0)
997
997
ret = -EINVAL;
998
+
if (ret < 0)
998
999
goto free_master;
999
-
}
1000
+
dspi->irq = ret;
1000
1001
1001
1002
ret = devm_request_threaded_irq(&pdev->dev, dspi->irq, davinci_spi_irq,
1002
1003
dummy_thread_fn, 0, dev_name(&pdev->dev), dspi);