Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07443cec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A couple of very minor fixes, one for error handling in the Davinci
  driver probe function and another making the Renesas sh-msiof DT
  binding documentation correspond to what's actually implemented"

* tag 'spi-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: sh-msiof: Match renesas,rx-fifo-size in DT bindings doc with driver
  spi: davinci: fix handling platform_get_irq result
parents 21f3c961 c2c80bdb

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings: 
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words

			 (default is 64)

- 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

Documentation/devicetree/bindings/pinctrl/renesas,*.

drivers/spi/spi-davinci.c

+4 −3
Original line number Diff line number Diff line
@@ -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);