diff options
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 1 | ||||
| -rw-r--r-- | fs/ext2/ext2fs.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 84413de0c1..c8d66b89a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -72,6 +72,9 @@ Holger Brunck <holger.brunck@keymile.com> kmeter1 MPC8360 kmcoge5ne MPC8360 + mgcoge MPC8247 + mgcoge3ne MPC8247 + suvd3 MPC8321 tuge1 MPC8321 tuxx1 MPC8321 @@ -441,13 +444,10 @@ Heiko Schocher <hs@denx.de> ids8247 MPC8247 jupiter MPC5200 kmsupx5 MPC8321 - mgcoge MPC8247 - mgcoge3ne MPC8247 mucmc52 MPC5200 muas3001 MPC8270 municse MPC5200 sc3 PPC405GP - suvd3 MPC8321 uc101 MPC5200 ve8313 MPC8313 diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index cd3f9fa856..80b981f10f 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -44,7 +44,6 @@ COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS-$(CONFIG_SH_SPI) += sh_spi.o COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o COBJS := $(COBJS-y) diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index 182f0acaca..418404e606 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -440,9 +440,8 @@ int ext2fs_read_file /* grab middle blocks in one go */ if (i != pos / blocksize && i < blockcnt - 1 && blockcnt > 3) { int oldblk = blknr; - int blocknxt; + int blocknxt = ext2fs_read_block(node, i + 1); while (i < blockcnt - 1) { - blocknxt = ext2fs_read_block(node, i + 1); if (blocknxt == (oldblk + 1)) { oldblk = blocknxt; i++; @@ -450,6 +449,7 @@ int ext2fs_read_file blocknxt = ext2fs_read_block(node, i); break; } + blocknxt = ext2fs_read_block(node, i); } if (oldblk == blknr) |
