diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-27 17:04:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-27 17:04:00 -0700 |
| commit | fbd1a04b210d56ef84200df56fc0291746d4d4dc (patch) | |
| tree | d3e963a13fb2c027129c9342a204a430b88c2f90 /arch/arm/mach-msm/clock-debug.c | |
| parent | b88923451f792643a4b23fd2cab266a4cd4350da (diff) | |
| parent | 7ba655fc965b073292349fa49fb9d16d701185bc (diff) | |
Merge branch 'msm/fixes' into next/late
Merging in msm/fixes to avoid silly conflicts at top level.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-msm/clock-debug.c')
| -rw-r--r-- | arch/arm/mach-msm/clock-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c index 4886404d42f..b0fbdf1cbdd 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); |