---

yaml
---
r: 142559
b: refs/heads/master
c: 2cf3683
h: refs/heads/master
i:
  142557: 7fd11e5
  142555: d29941a
  142551: ccbc490
  142543: c7f8a0b
  142527: 33734e4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a963ea83b316b0a3ebf1c7118a6c36b5cd334bb6
+refs/heads/master: 2cf3683472f043e6748c48228df6d8a35a47ecc2

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) {