diff options
| author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-02-20 09:29:16 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-09 22:10:08 +0200 |
| commit | 33c8abcee7e6c0828c9c76114e11e31fbcaec4e9 (patch) | |
| tree | abc13cdc5f99fe99d23a812067f3ce1e27698591 /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | ARM: exynos: dts: cros5250: add cyapa trackpad (diff) | |
| download | linux-33c8abcee7e6c0828c9c76114e11e31fbcaec4e9.tar.xz linux-33c8abcee7e6c0828c9c76114e11e31fbcaec4e9.zip | |
ARM: ux500: read the correct soc_id number
Fix db8500_read_soc_id() to read all five soc_id number locations
instead of repeating the second one two times.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 995928ba22fd..e90b5ab23b6d 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -191,7 +191,7 @@ static const char *db8500_read_soc_id(void) /* Throw these device-specific numbers into the entropy pool */ add_device_randomness(uid, 0x14); return kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", - readl((u32 *)uid+1), + readl((u32 *)uid+0), readl((u32 *)uid+1), readl((u32 *)uid+2), readl((u32 *)uid+3), readl((u32 *)uid+4)); } |