Re: [PATCH] spi-gpio: SPI_MASTER_NO_RX bit tested twice, missingSPI_MASTER_NO_TX?

[Grant Likely]

On Sat, Oct 02, 2010 at 02:03:32PM +0200, Roel Kluin wrote:
> The SPI_MASTER_NO_TX bit (can't do buffer write) wasn't tested.
> 
> Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
> ---
>  drivers/spi/spi_gpio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> Is this what was intended?
> 

Obviously correct.  Merged

g.

> diff --git a/drivers/spi/spi_gpio.c b/drivers/spi/spi_gpio.c
> index e24a634..63e51b0 100644
> --- a/drivers/spi/spi_gpio.c
> +++ b/drivers/spi/spi_gpio.c
> @@ -350,7 +350,7 @@ static int __init spi_gpio_probe(struct platform_device *pdev)
>  	spi_gpio->bitbang.master = spi_master_get(master);
>  	spi_gpio->bitbang.chipselect = spi_gpio_chipselect;
>  
> -	if ((master_flags & (SPI_MASTER_NO_RX | SPI_MASTER_NO_RX)) == 0) {
> +	if ((master_flags & (SPI_MASTER_NO_TX | SPI_MASTER_NO_RX)) == 0) {
>  		spi_gpio->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;
>  		spi_gpio->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;
>  		spi_gpio->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/