diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 01:21:37 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 01:21:37 (GMT) |
| commit | f1324f69c03232b8ba94f3d7baa65983f51ce931 (patch) | |
| tree | a9d32f357fde8aec4464327ed36902708890378f /arch/arm | |
| parent | 0d6128f85a16ad290ba32099a622c4b1aaa73641 (diff) | |
| parent | 7ba655fc965b073292349fa49fb9d16d701185bc (diff) | |
| download | linux-fsl-qoriq-f1324f69c03232b8ba94f3d7baa65983f51ce931.tar.xz | |
Merge tag 'msm-fix-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/fixes-non-critical
From David Brown:
Some minor fixes for MSM for 3.11
I don't expect these to be necessary for stable, since the fixes are
to recently added code. The strncpy fix is only in debug code that
isn't normally compiled or used (and is being removed in upcoming
patches).
* tag 'msm-fix-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
gpio: msm-v1: Remove errant __devinit to fix compile
mfd: ssbi: Add MODULE_DEVICE_TABLE
ARM: dts: msm: Fix bad register addresses
arch: arm: mach-msm: using strlcpy instead of strncpy
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/msm8660-surf.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/msm8960-cdp.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/clock-debug.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts index 9bf49b3..d347082 100644 --- a/arch/arm/boot/dts/msm8660-surf.dts +++ b/arch/arm/boot/dts/msm8660-surf.dts @@ -15,7 +15,7 @@ < 0x02081000 0x1000 >; }; - timer@2000004 { + timer@2000000 { compatible = "qcom,scss-timer", "qcom,msm-timer"; interrupts = <1 0 0x301>, <1 1 0x301>, @@ -26,7 +26,7 @@ cpu-offset = <0x40000>; }; - serial@19c400000 { + serial@19c40000 { compatible = "qcom,msm-hsuart", "qcom,msm-uart"; reg = <0x19c40000 0x1000>, <0x19c00000 0x1000>; diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts index 2e4d87a..7c9ef9b 100644 --- a/arch/arm/boot/dts/msm8960-cdp.dts +++ b/arch/arm/boot/dts/msm8960-cdp.dts @@ -26,7 +26,7 @@ cpu-offset = <0x80000>; }; - serial@19c400000 { + serial@16440000 { compatible = "qcom,msm-hsuart", "qcom,msm-uart"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c index 4886404..b0fbdf1 100644 --- a/arch/arm/mach-msm/clock-debug.c +++ b/arch/arm/mach-msm/clock-debug.c @@ -104,7 +104,7 @@ int __init clock_debug_add(struct clk *clock) if (!debugfs_base) return -ENOMEM; - strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1); + strlcpy(temp, clock->dbg_name, ARRAY_SIZE(temp)); for (ptr = temp; *ptr; ptr++) *ptr = tolower(*ptr); |