diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 04:37:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 04:37:20 +0300 |
| commit | 09fd671ccb2475436bd5f597f751ca4a7d177aea (patch) | |
| tree | 44e1b7bad93a9107a1335c134a328e934349a8eb /drivers/video/fbdev/metronomefb.c | |
| parent | bace3db5da970c4d4f80a1ffa988ec66c7f6a8f5 (diff) | |
| parent | 13aa38e291bdd4e4018f40dd2f75e464814dcbf3 (diff) | |
| download | linux-09fd671ccb2475436bd5f597f751ca4a7d177aea.tar.xz | |
Merge tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen:
- Miscallaneous small fixes to various fbdev drivers
- Remove fb_rotate, which was never used
- pmag fb improvements
* tag 'fbdev-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (21 commits)
xen kconfig: don't "select INPUT_XEN_KBDDEV_FRONTEND"
video: fbdev: sis: remove unused variable
drivers/video: make fbdev/sunxvr2500.c explicitly non-modular
drivers/video: make fbdev/sunxvr1000.c explicitly non-modular
drivers/video: make fbdev/sunxvr500.c explicitly non-modular
video: exynos: fix modular build
fbdev: da8xx-fb: fix videomodes of lcd panels
fbdev: kill fb_rotate
video: fbdev: bt431: Correct cursor format control macro
video: fbdev: pmag-ba-fb: Optimize Bt455 colormap addressing
video: fbdev: pmag-ba-fb: Fix and rework Bt455 colormap handling
video: fbdev: bt455: Remove unneeded colormap helpers for cursor support
video: fbdev: pmag-aa-fb: Report video timings
video: fbdev: pmag-aa-fb: Enable building as a module
video: fbdev: pmag-aa-fb: Adapt to current APIs
video: fbdev: pmag-ba-fb: Fix the lower margin size
fbdev: sh_mobile_lcdc: Use ARCH_RENESAS
fbdev: n411: check return value
fbdev: exynos: fix IS_ERR_VALUE usage
video: Use bool instead int pointer for get_opt_bool() argument
...
Diffstat (limited to 'drivers/video/fbdev/metronomefb.c')
| -rw-r--r-- | drivers/video/fbdev/metronomefb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c index ad04a01e2761..abb6bbf226d5 100644 --- a/drivers/video/fbdev/metronomefb.c +++ b/drivers/video/fbdev/metronomefb.c @@ -354,7 +354,8 @@ static int metronome_powerup_cmd(struct metronomefb_par *par) } /* the rest are 0 */ - memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2); + memset(&par->metromem_cmd->args[i], 0, + (ARRAY_SIZE(par->metromem_cmd->args) - i) * 2); par->metromem_cmd->csum = cs; @@ -376,7 +377,8 @@ static int metronome_config_cmd(struct metronomefb_par *par) memcpy(par->metromem_cmd->args, epd_frame_table[par->dt].config, sizeof(epd_frame_table[par->dt].config)); /* the rest are 0 */ - memset((u8 *) (par->metromem_cmd->args + 4), 0, (32-4)*2); + memset(&par->metromem_cmd->args[4], 0, + (ARRAY_SIZE(par->metromem_cmd->args) - 4) * 2); par->metromem_cmd->csum = 0xCC10; par->metromem_cmd->csum += calc_img_cksum(par->metromem_cmd->args, 4); |