From 68b57671447d85df642ddddcc09e52e5a8a65564 Mon Sep 17 00:00:00 2001 From: channing Date: Wed, 16 Jan 2013 13:14:20 +0800 Subject: [PATCH] --- yaml --- r: 348909 b: refs/heads/master c: 5dd070d21e2cb34b4162d564d73cca3591f94389 h: refs/heads/master i: 348907: f5e8d447e54a4a60af3eed3bc16092fb8e1917f7 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/ifx6x60.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d5a28a158fec..d64cb4f83ad7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68e56cb3a068f9c30971c6117fbbd1e32918e49e +refs/heads/master: 5dd070d21e2cb34b4162d564d73cca3591f94389 diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c index 7eed3235dad4..8cb6d8d66a13 100644 --- a/trunk/drivers/tty/serial/ifx6x60.c +++ b/trunk/drivers/tty/serial/ifx6x60.c @@ -811,7 +811,8 @@ static void ifx_spi_io(unsigned long data) ifx_dev->spi_xfer.cs_change = 0; ifx_dev->spi_xfer.speed_hz = ifx_dev->spi_dev->max_speed_hz; /* ifx_dev->spi_xfer.speed_hz = 390625; */ - ifx_dev->spi_xfer.bits_per_word = spi_bpw; + ifx_dev->spi_xfer.bits_per_word = + ifx_dev->spi_dev->bits_per_word; ifx_dev->spi_xfer.tx_buf = ifx_dev->tx_buffer; ifx_dev->spi_xfer.rx_buf = ifx_dev->rx_buffer;