From 9371ea9b6713f8540927ad63ab11d451297b9775 Mon Sep 17 00:00:00 2001 From: Yi Li Date: Mon, 6 Apr 2009 19:00:44 -0700 Subject: [PATCH] --- yaml --- r: 142559 b: refs/heads/master c: 2cf3683472f043e6748c48228df6d8a35a47ecc2 h: refs/heads/master i: 142557: 7fd11e5739cca5ad320a5b4f79818c8d913e2683 142555: d29941a80ff69f58319b4a1615a1502df7d2cd7d 142551: ccbc490a9a1d1337d0f4e3f2a0f3c896953b2fd5 142543: c7f8a0b195ba1f49b92abd3c3afdc489dc810b1d 142527: 33734e49fa821649b15d3c615c6a6061d3805e68 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_bfin5xx.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2780cf4f539e..3486042e0c48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a963ea83b316b0a3ebf1c7118a6c36b5cd334bb6 +refs/heads/master: 2cf3683472f043e6748c48228df6d8a35a47ecc2 diff --git a/trunk/drivers/spi/spi_bfin5xx.c b/trunk/drivers/spi/spi_bfin5xx.c index 317731a9cd6d..122292557bf3 100644 --- a/trunk/drivers/spi/spi_bfin5xx.c +++ b/trunk/drivers/spi/spi_bfin5xx.c @@ -189,6 +189,7 @@ static void cs_deactive(struct driver_data *drv_data, struct chip_data *chip) { u16 flag = read_FLAG(drv_data); + flag &= ~chip->flag; flag |= (chip->flag << 8); write_FLAG(drv_data, flag); @@ -1036,7 +1037,6 @@ static int setup(struct spi_device *spi) struct bfin5xx_spi_chip *chip_info = NULL; struct chip_data *chip; struct driver_data *drv_data = spi_master_get_devdata(spi->master); - u8 spi_flg; /* Abort device setup if requested features are not supported */ if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST)) { @@ -1119,8 +1119,7 @@ static int setup(struct spi_device *spi) * SPI_BAUD, not the real baudrate */ chip->baud = hz_to_spi_baud(spi->max_speed_hz); - spi_flg = ~(1 << (spi->chip_select)); - chip->flag = ((u16) spi_flg << 8) | (1 << (spi->chip_select)); + chip->flag = 1 << (spi->chip_select); chip->chip_select_num = spi->chip_select; switch (chip->bits_per_word) {