diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:32:40 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:32:40 -0700 |
| commit | c7101dcf349bdb3fab576942113fb39a5c0c3ce4 (patch) | |
| tree | 007998dcbdb919dc038f0ae44422ea8cb353a1d5 /arch/arm/mm | |
| parent | 2298563cff64db252affbe2eb5e979d59b4c0187 (diff) | |
| parent | b7be2a1de3f5c0827a4f8ccb6a18342d9d4dc446 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 7e7583ddd607..6e4b9ff22ef3 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1953,7 +1953,7 @@ static int extend_iommu_mapping(struct dma_iommu_mapping *mapping) { int next_bitmap; - if (mapping->nr_bitmaps > mapping->extensions) + if (mapping->nr_bitmaps >= mapping->extensions) return -EINVAL; next_bitmap = mapping->nr_bitmaps; |