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_cotable.c | |
| parent | Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
| parent | drm/vmwgfx: constify pci_device_id. (diff) | |
| download | linux-dev-739b000994b7c813e4cac56c077abd8f6b0ccaab.tar.xz linux-dev-739b000994b7c813e4cac56c077abd8f6b0ccaab.zip | |
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_cotable.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c index 6c026d75c180..d87861bbe971 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c @@ -584,7 +584,7 @@ struct vmw_resource *vmw_cotable_alloc(struct vmw_private *dev_priv, return ERR_PTR(ret); vcotbl = kzalloc(sizeof(*vcotbl), GFP_KERNEL); - if (unlikely(vcotbl == NULL)) { + if (unlikely(!vcotbl)) { ret = -ENOMEM; goto out_no_alloc; } |