diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-08-03 23:12:09 +0200 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-08-03 23:12:09 +0200 |
| commit | 52215890ef7c4d06fd3323f8315d85f14d637a91 (patch) | |
| tree | 2f97aaab909de9fa903ba52224f6f643e2f25cf5 /arch/arm | |
| parent | 4309a7ffa8aa46ac2fc4090cebc3efeb00dce72f (diff) | |
| download | kernel_samsung_smdk4412-52215890ef7c4d06fd3323f8315d85f14d637a91.zip kernel_samsung_smdk4412-52215890ef7c4d06fd3323f8315d85f14d637a91.tar.gz kernel_samsung_smdk4412-52215890ef7c4d06fd3323f8315d85f14d637a91.tar.bz2 | |
samsung opensource update4
Change-Id: I9db25f213bb1577c4468873c66b230a0566b6cf2
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/common/pl330.c | 3 | ||||
| -rw-r--r-- | arch/arm/configs/m0_00_defconfig | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c index 6ff29e5..6147b24 100644 --- a/arch/arm/common/pl330.c +++ b/arch/arm/common/pl330.c @@ -1532,6 +1532,9 @@ int pl330_update(const struct pl330_info *pi) id = pl330->events[ev]; + if (id == -1) /* Released? */ + continue; + thrd = &pl330->channels[id]; active = _thrd_active(thrd); diff --git a/arch/arm/configs/m0_00_defconfig b/arch/arm/configs/m0_00_defconfig index 2e2ea69..933e9a8 100644 --- a/arch/arm/configs/m0_00_defconfig +++ b/arch/arm/configs/m0_00_defconfig @@ -2548,7 +2548,7 @@ CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_CLKGATE=y CONFIG_MMC_EMBEDDED_SDIO=y -CONFIG_MMC_PARANOID_SD_INIT=y +# CONFIG_MMC_PARANOID_SD_INIT is not set CONFIG_MMC_NOT_USE_SANITIZE=y # CONFIG_MMC_POLLING_WAIT_CMD23 is not set |