diff mbox

[v2] spi: altera: Add empty implementation of setup_transfer callback

Message ID 1428594853-24640-1-git-send-email-per.nilsson@xelmo.com (mailing list archive)
State New, archived
Headers show

Commit Message

Pelle Nilsson April 9, 2015, 3:54 p.m. UTC
spi-altera driver is broken and causes a kernel panic due to a NULL
pointer dereference during first SPI transaction. The setup_transfer()
bitbang callback is mandatory when the txrx_bufs() callback is
present. It was therefore an error to remove it in commit
30af9b558a56. This patch simply adds back an empty implementation of
the callback.

Signed-off-by: Pelle Nilsson <per.nilsson@xelmo.com>
---
 drivers/spi/spi-altera.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Mark Brown April 9, 2015, 4:23 p.m. UTC | #1
On Thu, Apr 09, 2015 at 05:54:13PM +0200, Pelle Nilsson wrote:

> present. It was therefore an error to remove it in commit
> 30af9b558a56. This patch simply adds back an empty implementation of

Please always provide a human readable description of commits as well as
the IDs.  As I said in reply to your previous mail why is this the best
fix?
diff mbox

Patch

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index b95010e..6d72b1d 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -197,6 +197,11 @@  static irqreturn_t altera_spi_irq(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
+static int altera_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
+{
+	return 0;
+}
+
 static int altera_spi_probe(struct platform_device *pdev)
 {
 	struct altera_spi *hw;
@@ -220,6 +225,7 @@  static int altera_spi_probe(struct platform_device *pdev)
 
 	/* setup the state for the bitbang driver */
 	hw->bitbang.master = master;
+	hw->bitbang.setup_transfer = altera_spi_setupxfer;
 	hw->bitbang.chipselect = altera_spi_chipsel;
 	hw->bitbang.txrx_bufs = altera_spi_txrx;