From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753734AbbDMKI0 (ORCPT ); Mon, 13 Apr 2015 06:08:26 -0400 Received: from mail5.surf-town.net ([212.97.132.45]:56431 "EHLO mailgw8.surf-town.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753338AbbDMKIX (ORCPT ); Mon, 13 Apr 2015 06:08:23 -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] spi: bitbang: Make setup_transfer callback optional Date: Mon, 13 Apr 2015 12:08:05 +0200 Message-Id: <1428919685-14190-1-git-send-email-per.nilsson@xelmo.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <552B9045.4040709@xelmo.com> References: <552B9045.4040709@xelmo.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org spi-altera doesn't register this callback, and doesn't have a need for it, but currently causes a NULL dereference when callback is called. --- drivers/spi/spi-bitbang.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c index 5ef6638..d02057d 100644 --- a/drivers/spi/spi-bitbang.c +++ b/drivers/spi/spi-bitbang.c @@ -180,7 +180,7 @@ int spi_bitbang_setup(struct spi_device *spi) { struct spi_bitbang_cs *cs = spi->controller_state; struct spi_bitbang *bitbang; - int retval; + int retval = 0; unsigned long flags; bitbang = spi_master_get_devdata(spi->master); @@ -197,7 +197,8 @@ int spi_bitbang_setup(struct spi_device *spi) if (!cs->txrx_word) return -EINVAL; - retval = bitbang->setup_transfer(spi, NULL); + if (bitbang->setup_transfer) + retval = bitbang->setup_transfer(spi, NULL); if (retval < 0) return retval; @@ -295,9 +296,11 @@ static int spi_bitbang_transfer_one(struct spi_master *master, /* init (-1) or override (1) transfer params */ if (do_setup != 0) { - status = bitbang->setup_transfer(spi, t); - if (status < 0) - break; + if (bitbang->setup_transfer) { + status = bitbang->setup_transfer(spi, t); + if (status < 0) + break; + } if (do_setup == -1) do_setup = 0; } -- 1.9.1