diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
| commit | 0ea97d66df2a8b85698823b4d55d798a7870d7b5 (patch) | |
| tree | e4f36af1342ebcbcb5878e66b1e72661b6f2ca1d /drivers/video/fbdev/uvesafb.c | |
| parent | eed41b9f413f40183095d27ffc94fb942fe18bb6 (diff) | |
| parent | 6183a1afdd2fb1c994e95af9d6db45f157241a04 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.07-rt
Diffstat (limited to 'drivers/video/fbdev/uvesafb.c')
| -rw-r--r-- | drivers/video/fbdev/uvesafb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 73676eb0244a..c592ca513115 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -1044,7 +1044,8 @@ static int uvesafb_setcmap(struct fb_cmap *cmap, struct fb_info *info) info->cmap.len || cmap->start < info->cmap.start) return -EINVAL; - entries = kmalloc(sizeof(*entries) * cmap->len, GFP_KERNEL); + entries = kmalloc_array(cmap->len, sizeof(*entries), + GFP_KERNEL); if (!entries) return -ENOMEM; |