diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-04-15 15:51:49 +1000 |
| commit | f06ddb53096b4cddad2c530125a78a3c2a1d28a4 (patch) | |
| tree | 36a05922af22272dc82357ce82be21a3a9214bd0 /drivers/gpu/drm/vkms | |
| parent | Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
| parent | Linux 5.1-rc5 (diff) | |
| download | linux-dev-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.tar.xz linux-dev-f06ddb53096b4cddad2c530125a78a3c2a1d28a4.zip | |
BackMerge v5.1-rc5 into drm-next
Need rc5 for udl fix to add udl cleanups on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vkms')
| -rw-r--r-- | drivers/gpu/drm/vkms/vkms_gem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c index 138b0bb325cf..69048e73377d 100644 --- a/drivers/gpu/drm/vkms/vkms_gem.c +++ b/drivers/gpu/drm/vkms/vkms_gem.c @@ -111,11 +111,8 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev, ret = drm_gem_handle_create(file, &obj->gem, handle); drm_gem_object_put_unlocked(&obj->gem); - if (ret) { - drm_gem_object_release(&obj->gem); - kfree(obj); + if (ret) return ERR_PTR(ret); - } return &obj->gem; } |