projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-v3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
spi
/
spi-clps711x.c
diff --git
a/drivers/spi/spi-clps711x.c
b/drivers/spi/spi-clps711x.c
index 1366c4620d5d10b125f2ddb29b2a416d5d0d7033..a11cbf02691a88564ea8b8b33331453a7163b72a 100644
(file)
--- a/
drivers/spi/spi-clps711x.c
+++ b/
drivers/spi/spi-clps711x.c
@@
-68,7
+68,7
@@
static int spi_clps711x_setup_xfer(struct spi_device *spi,
struct spi_transfer *xfer)
{
u32 speed = xfer->speed_hz ? : spi->max_speed_hz;
- u8 bpw = xfer->bits_per_word
? : spi->bits_per_word
;
+ u8 bpw = xfer->bits_per_word;
struct spi_clps711x_data *hw = spi_master_get_devdata(spi->master);
if (bpw != 8) {