summaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-14 15:26:44 +0200
committerArnd Bergmann <arnd@arndb.de>2016-07-14 15:26:44 +0200
commitf8c6d88b2c874295f49b9ad1ca0826b9a8ef3180 (patch)
tree6ba625358c04f8aa9d747a60416eed2b366ccee1 /drivers/memory
parentf1844aca29025bb436bfc4f872456b832632df56 (diff)
parentaec6341e2ac76ea8703642e83535f216b8866162 (diff)
downloadop-kernel-dev-f8c6d88b2c874295f49b9ad1ca0826b9a8ef3180.zip
op-kernel-dev-f8c6d88b2c874295f49b9ad1ca0826b9a8ef3180.tar.gz
Merge tag 'samsung-drivers-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers
Merge "Samsung drivers/soc update for v4.8, part 3" into next/drivers: 1. Fix size of allocation for Exynos SROM registers (too much was allocated). 2. Constify fix. * tag 'samsung-drivers-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: soc: samsung: pmu: Constify arrays with PMU data memory: samsung: exynos-srom: Fix wrong count of registers
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/samsung/exynos-srom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/samsung/exynos-srom.c b/drivers/memory/samsung/exynos-srom.c
index 067f533..bf827a6 100644
--- a/drivers/memory/samsung/exynos-srom.c
+++ b/drivers/memory/samsung/exynos-srom.c
@@ -134,7 +134,7 @@ static int exynos_srom_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, srom);
srom->reg_offset = exynos_srom_alloc_reg_dump(exynos_srom_offsets,
- sizeof(exynos_srom_offsets));
+ ARRAY_SIZE(exynos_srom_offsets));
if (!srom->reg_offset) {
iounmap(srom->reg_base);
return -ENOMEM;
OpenPOWER on IntegriCloud