Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e768659 authored by Bob Liu's avatar Bob Liu Committed by Mike Frysinger
Browse files

spi/bfin_spi: check per-transfer bits_per_word 



Currently, if the bits_per_word when doing a transfer is not 8bits, we
always treat it as 16bits when we should actually be returning an error.

Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 4190f6a5

drivers/spi/spi_bfin5xx.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -644,11 +644,16 @@ static void bfin_spi_pump_transfers(unsigned long data) 
		drv_data->len = transfer->len;

		drv_data->len = transfer->len;

		cr_width = 0;

		cr_width = 0;

		drv_data->ops = &bfin_transfer_ops_u8;

		drv_data->ops = &bfin_transfer_ops_u8;

	} else {

	} else if (bits_per_word == 16) {

		drv_data->n_bytes = 2;

		drv_data->n_bytes = 2;

		drv_data->len = (transfer->len) >> 1;

		drv_data->len = (transfer->len) >> 1;

		cr_width = BIT_CTL_WORDSIZE;

		cr_width = BIT_CTL_WORDSIZE;

		drv_data->ops = &bfin_transfer_ops_u16;

		drv_data->ops = &bfin_transfer_ops_u16;

	} else {

		dev_err(&drv_data->pdev->dev, "transfer: unsupported bits_per_word\n");

		message->status = -EINVAL;

		bfin_spi_giveback(drv_data);

		return;

	}

	}

	cr = read_CTRL(drv_data) & ~(BIT_CTL_TIMOD | BIT_CTL_WORDSIZE);

	cr = read_CTRL(drv_data) & ~(BIT_CTL_TIMOD | BIT_CTL_WORDSIZE);

	cr |= cr_width;

	cr |= cr_width;