From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 19 Jun 2019 10:01:41 +0000 Subject: [PATCH] drm: self_refresh: Fix a reversed condition in drm_self_refresh_helper_cleanup() Message-Id: <20190619100141.GA28596@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Maarten Lankhorst , Sean Paul Cc: Maxime Ripard , David Airlie , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org This test is flipped around so it either leads to a memory leak or a NULL dereference. Fixes: 1452c25b0e60 ("drm: Add helpers to kick off self refresh mode in drivers") Signed-off-by: Dan Carpenter --- I'm not totally sure what the prefered patch prefix for this code. One thing that would help is when we're adding new files we should specify the prefix that they're going to use: - drm: Add helpers to kick off self refresh mode in drivers + drm: refresh mode: Add helpers to kick off self refresh mode in drivers It's a small thing and email always sounds whiny but I'm sending this suggestion to everyone today so... drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_self_refresh_helper.c b/drivers/gpu/drm/drm_self_refresh_helper.c index 2b3daaf77841..e0d2ad1f070c 100644 --- a/drivers/gpu/drm/drm_self_refresh_helper.c +++ b/drivers/gpu/drm/drm_self_refresh_helper.c @@ -205,7 +205,7 @@ void drm_self_refresh_helper_cleanup(struct drm_crtc *crtc) struct drm_self_refresh_data *sr_data = crtc->self_refresh_data; /* Helper is already uninitialized */ - if (sr_data) + if (!sr_data) return; crtc->self_refresh_data = NULL; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm: self_refresh: Fix a reversed condition in drm_self_refresh_helper_cleanup() Date: Wed, 19 Jun 2019 13:01:41 +0300 Message-ID: <20190619100141.GA28596@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by gabe.freedesktop.org (Postfix) with ESMTPS id C971C6E34D for ; Wed, 19 Jun 2019 10:02:05 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst , Sean Paul Cc: Maxime Ripard , David Airlie , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyB0ZXN0IGlzIGZsaXBwZWQgYXJvdW5kIHNvIGl0IGVpdGhlciBsZWFkcyB0byBhIG1lbW9y eSBsZWFrIG9yIGEKTlVMTCBkZXJlZmVyZW5jZS4KCkZpeGVzOiAxNDUyYzI1YjBlNjAgKCJkcm06 IEFkZCBoZWxwZXJzIHRvIGtpY2sgb2ZmIHNlbGYgcmVmcmVzaCBtb2RlIGluIGRyaXZlcnMiKQpT aWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+Ci0t LQpJJ20gbm90IHRvdGFsbHkgc3VyZSB3aGF0IHRoZSBwcmVmZXJlZCBwYXRjaCBwcmVmaXggZm9y IHRoaXMgY29kZS4gIE9uZQp0aGluZyB0aGF0IHdvdWxkIGhlbHAgaXMgd2hlbiB3ZSdyZSBhZGRp bmcgbmV3IGZpbGVzIHdlIHNob3VsZCBzcGVjaWZ5CnRoZSBwcmVmaXggdGhhdCB0aGV5J3JlIGdv aW5nIHRvIHVzZToKCi0gZHJtOiBBZGQgaGVscGVycyB0byBraWNrIG9mZiBzZWxmIHJlZnJlc2gg bW9kZSBpbiBkcml2ZXJzCisgZHJtOiByZWZyZXNoIG1vZGU6IEFkZCBoZWxwZXJzIHRvIGtpY2sg b2ZmIHNlbGYgcmVmcmVzaCBtb2RlIGluIGRyaXZlcnMKCkl0J3MgYSBzbWFsbCB0aGluZyBhbmQg ZW1haWwgYWx3YXlzIHNvdW5kcyB3aGlueSBidXQgSSdtIHNlbmRpbmcgdGhpcwpzdWdnZXN0aW9u IHRvIGV2ZXJ5b25lIHRvZGF5IHNvLi4uCgogZHJpdmVycy9ncHUvZHJtL2RybV9zZWxmX3JlZnJl c2hfaGVscGVyLmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3NlbGZfcmVmcmVzaF9o ZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2VsZl9yZWZyZXNoX2hlbHBlci5jCmluZGV4 IDJiM2RhYWY3Nzg0MS4uZTBkMmFkMWYwNzBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX3NlbGZfcmVmcmVzaF9oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3NlbGZf cmVmcmVzaF9oZWxwZXIuYwpAQCAtMjA1LDcgKzIwNSw3IEBAIHZvaWQgZHJtX3NlbGZfcmVmcmVz aF9oZWxwZXJfY2xlYW51cChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9zZWxm X3JlZnJlc2hfZGF0YSAqc3JfZGF0YSA9IGNydGMtPnNlbGZfcmVmcmVzaF9kYXRhOwogCiAJLyog SGVscGVyIGlzIGFscmVhZHkgdW5pbml0aWFsaXplZCAqLwotCWlmIChzcl9kYXRhKQorCWlmICgh c3JfZGF0YSkKIAkJcmV0dXJuOwogCiAJY3J0Yy0+c2VsZl9yZWZyZXNoX2RhdGEgPSBOVUxMOwot LSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=