diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
| commit | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (patch) | |
| tree | 6b50ccc855dff4717749974630d258ba786811d0 /drivers/spi | |
| parent | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (diff) | |
| parent | 5287d595449512385e25f5afcb68a130bf08bae6 (diff) | |
| download | u-boot-304f936aeaab0c3cc9d5af438fd3498ac7682991.tar.gz u-boot-304f936aeaab0c3cc9d5af438fd3498ac7682991.tar.xz u-boot-304f936aeaab0c3cc9d5af438fd3498ac7682991.zip | |
Merge remote-tracking branch 'u-boot-samsung/master'
Conflicts:
boards.cfg
Conflict was trivial between goni maintainer change and
lager_nor removal.
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/exynos_spi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 4d5def2d31..c92276fdf7 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -302,7 +302,10 @@ static int spi_rx_tx(struct exynos_spi_slave *spi_slave, int todo, } } else { if (rxp || stopping) { - *rxp = temp; + if (step == 4) + *(uint32_t *)rxp = temp; + else + *rxp = temp; rxp += step; } in_bytes -= step; |