diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
| commit | 5af6a242945e39bf6ea39716d4eba316b735dce8 (patch) | |
| tree | 35363a04680e1618f6ed1c2b4eafbbc3d59ef048 /drivers/gpu/drm/qxl/qxl_ioctl.c | |
| parent | 7eff2ffe05a8b2c6c83a4f511ac6c31c858e3048 (diff) | |
| parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_ioctl.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index 56a13a915155..0928c5e2bafd 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c @@ -168,7 +168,8 @@ static int qxl_process_single_command(struct qxl_device *qdev, cmd->command_size)) return -EFAULT; - reloc_info = kmalloc(sizeof(struct qxl_reloc_info) * cmd->relocs_num, GFP_KERNEL); + reloc_info = kmalloc_array(cmd->relocs_num, + sizeof(struct qxl_reloc_info), GFP_KERNEL); if (!reloc_info) return -ENOMEM; |