diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2020-03-27 22:36:17 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-03-27 22:36:17 +0100 |
commit | 06dd3f31cb70035cbd3f507c11fd50e3089aeb81 (patch) | |
tree | 98065919df104fba32191f2464f4193a998cd6a1 /drivers/hid/hid-picolcd_fb.c | |
parent | tools: gpio: Fix out-of-tree build regression (diff) | |
parent | Linux 5.6-rc7 (diff) | |
download | wireguard-linux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.tar.xz wireguard-linux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.zip |
Merge tag 'v5.6-rc7' into devel
Linux 5.6-rc7
Diffstat (limited to 'drivers/hid/hid-picolcd_fb.c')
-rw-r--r-- | drivers/hid/hid-picolcd_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c index a549c42e8c90..33c102a60992 100644 --- a/drivers/hid/hid-picolcd_fb.c +++ b/drivers/hid/hid-picolcd_fb.c @@ -458,9 +458,9 @@ static ssize_t picolcd_fb_update_rate_show(struct device *dev, if (ret >= PAGE_SIZE) break; else if (i == fb_update_rate) - ret += snprintf(buf+ret, PAGE_SIZE-ret, "[%u] ", i); + ret += scnprintf(buf+ret, PAGE_SIZE-ret, "[%u] ", i); else - ret += snprintf(buf+ret, PAGE_SIZE-ret, "%u ", i); + ret += scnprintf(buf+ret, PAGE_SIZE-ret, "%u ", i); if (ret > 0) buf[min(ret, (size_t)PAGE_SIZE)-1] = '\n'; return ret; |