From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 25 Mar 2019 09:23:49 +0000 Subject: [PATCH] drm/i915: Fix an error code in i915_gem_context_open() Message-Id: <20190325092349.GF16023@kadam> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jani Nikula , Chris Wilson Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org If gem_context_register() fails then "ctx" is a valid pointer, not an error pointer. We should just return "err". Fixes: 3aa9945a528e ("drm/i915: Separate GEM context construction and registration to userspace") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index e6f594668245..25f267a03d3d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -709,7 +709,7 @@ int i915_gem_context_open(struct drm_i915_private *i915, idr_destroy(&file_priv->context_idr); mutex_destroy(&file_priv->vm_idr_lock); mutex_destroy(&file_priv->context_idr_lock); - return PTR_ERR(ctx); + return err; } void i915_gem_context_close(struct drm_file *file) -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/i915: Fix an error code in i915_gem_context_open() Date: Mon, 25 Mar 2019 12:23:49 +0300 Message-ID: <20190325092349.GF16023@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , Chris Wilson Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SWYgZ2VtX2NvbnRleHRfcmVnaXN0ZXIoKSBmYWlscyB0aGVuICJjdHgiIGlzIGEgdmFsaWQgcG9p bnRlciwgbm90IGFuCmVycm9yIHBvaW50ZXIuICBXZSBzaG91bGQganVzdCByZXR1cm4gImVyciIu CgpGaXhlczogM2FhOTk0NWE1MjhlICgiZHJtL2k5MTU6IFNlcGFyYXRlIEdFTSBjb250ZXh0IGNv bnN0cnVjdGlvbiBhbmQgcmVnaXN0cmF0aW9uIHRvIHVzZXJzcGFjZSIpClNpZ25lZC1vZmYtYnk6 IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBp bnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKaW5kZXggZTZmNTk0NjY4MjQ1Li4yNWYyNjdhMDNkM2QgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTcwOSw3ICs3MDksNyBAQCBpbnQgaTkxNV9n ZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCWlkcl9kZXN0 cm95KCZmaWxlX3ByaXYtPmNvbnRleHRfaWRyKTsKIAltdXRleF9kZXN0cm95KCZmaWxlX3ByaXYt PnZtX2lkcl9sb2NrKTsKIAltdXRleF9kZXN0cm95KCZmaWxlX3ByaXYtPmNvbnRleHRfaWRyX2xv Y2spOwotCXJldHVybiBQVFJfRVJSKGN0eCk7CisJcmV0dXJuIGVycjsKIH0KIAogdm9pZCBpOTE1 X2dlbV9jb250ZXh0X2Nsb3NlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKLS0gCjIuMTcuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4