diff options
author | Dave Airlie <airlied@redhat.com> | 2017-07-24 15:57:28 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-07-24 15:57:28 +1000 |
commit | 739b000994b7c813e4cac56c077abd8f6b0ccaab (patch) | |
tree | 469be35535b2db6eb5fbd2dcece50bbe45c22e2a /drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | |
parent | 507e8e5e5d3fd640e24420be9cbd1c50190bdb4a (diff) | |
parent | 8046306fb9dedf216fc37a7dadc0e35ce37e9567 (diff) | |
download | op-kernel-dev-739b000994b7c813e4cac56c077abd8f6b0ccaab.zip op-kernel-dev-739b000994b7c813e4cac56c077abd8f6b0ccaab.tar.gz |
Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes
misc vmwgfx fixes.
* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
drm/vmwgfx: constify pci_device_id.
drm/vmwgfx: Fix gcc-7.1.1 warning
drm/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora
drm/vmwgfx: Limit max desktop dimensions to 8Kx8K
drm/vmwgfx: dma-buf: Constify ttm_place structures.
drm/vmwgfx: fix comment mistake for vmw_cmd_dx_set_index_buffer()
drm/vmwgfx: Use dma_pool_zalloc
drm/vmwgfx: Fix handling of errors returned by 'vmw_cotable_alloc()'
drm/vmwgfx: Fix NULL pointer comparison
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c index 1f013d4..36c7b6c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c @@ -205,7 +205,7 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man, int ret; cres = kzalloc(sizeof(*cres), GFP_KERNEL); - if (unlikely(cres == NULL)) + if (unlikely(!cres)) return -ENOMEM; cres->hash.key = user_key | (res_type << 24); @@ -291,7 +291,7 @@ vmw_cmdbuf_res_man_create(struct vmw_private *dev_priv) int ret; man = kzalloc(sizeof(*man), GFP_KERNEL); - if (man == NULL) + if (!man) return ERR_PTR(-ENOMEM); man->dev_priv = dev_priv; |