From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755859AbbDIPyb (ORCPT ); Thu, 9 Apr 2015 11:54:31 -0400 Received: from mail3.surf-town.net ([212.97.132.43]:43628 "EHLO mailgw21.surf-town.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753674AbbDIPy3 (ORCPT ); Thu, 9 Apr 2015 11:54:29 -0400 X-Spam-Flag: NO X-Spam-Score: -1.44 From: Pelle Nilsson To: broonie@kernel.org Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, nios2-dev@lists.rocketboards.org Subject: [PATCH v2] spi: altera: Add empty implementation of setup_transfer callback Date: Thu, 9 Apr 2015 17:54:13 +0200 Message-Id: <1428594853-24640-1-git-send-email-per.nilsson@xelmo.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428591822-24279-1-git-send-email-per.nilsson@xelmo.com> References: <1428591822-24279-1-git-send-email-per.nilsson@xelmo.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/spi/spi-altera.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; -- 1.9.1