From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Date: Mon, 04 Jan 2016 21:17:58 +0000 Subject: Re: [patch] drm/amd/powerplay: fix a reversed condition Message-Id: List-Id: References: <20160104204255.GB19867@mwanda> In-Reply-To: <20160104204255.GB19867@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: Jammy Zhou , kernel-janitors@vger.kernel.org, Maling list - DRI developers , Alex Deucher , Rex Zhu On Mon, Jan 4, 2016 at 3:42 PM, Dan Carpenter wrote: > This test was reversed so it would end up leading to a NULL dereference. > > Fixes: 4630f0faae80 ('drm/amd/powerplay: add Carrizo smu support') > Signed-off-by: Dan Carpenter Applied. thanks! Alex > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > index e74023b..873a8d2 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > @@ -818,7 +818,7 @@ static int cz_smu_fini(struct pp_smumgr *smumgr) > return -EINVAL; > > cz_smu = (struct cz_smumgr *)smumgr->backend; > - if (!cz_smu) { > + if (cz_smu) { > cgs_free_gpu_mem(smumgr->device, > cz_smu->toc_buffer.handle); > cgs_free_gpu_mem(smumgr->device, > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: Re: [patch] drm/amd/powerplay: fix a reversed condition Date: Mon, 4 Jan 2016 16:17:58 -0500 Message-ID: References: <20160104204255.GB19867@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yk0-f177.google.com (mail-yk0-f177.google.com [209.85.160.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4413D6E122 for ; Mon, 4 Jan 2016 13:17:59 -0800 (PST) Received: by mail-yk0-f177.google.com with SMTP id k129so239142797yke.0 for ; Mon, 04 Jan 2016 13:17:59 -0800 (PST) In-Reply-To: <20160104204255.GB19867@mwanda> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dan Carpenter Cc: Jammy Zhou , kernel-janitors@vger.kernel.org, Maling list - DRI developers , Alex Deucher , Rex Zhu List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBKYW4gNCwgMjAxNiBhdCAzOjQyIFBNLCBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVu dGVyQG9yYWNsZS5jb20+IHdyb3RlOgo+IFRoaXMgdGVzdCB3YXMgcmV2ZXJzZWQgc28gaXQgd291 bGQgZW5kIHVwIGxlYWRpbmcgdG8gYSBOVUxMIGRlcmVmZXJlbmNlLgo+Cj4gRml4ZXM6IDQ2MzBm MGZhYWU4MCAoJ2RybS9hbWQvcG93ZXJwbGF5OiBhZGQgQ2Fycml6byBzbXUgc3VwcG9ydCcpCj4g U2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoK QXBwbGllZC4gIHRoYW5rcyEKCkFsZXgKCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9wb3dlcnBsYXkvc211bWdyL2N6X3NtdW1nci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9w b3dlcnBsYXkvc211bWdyL2N6X3NtdW1nci5jCj4gaW5kZXggZTc0MDIzYi4uODczYThkMiAxMDA2 NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvY3pfc211bWdy LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvY3pfc211bWdy LmMKPiBAQCAtODE4LDcgKzgxOCw3IEBAIHN0YXRpYyBpbnQgY3pfc211X2Zpbmkoc3RydWN0IHBw X3NtdW1nciAqc211bWdyKQo+ICAgICAgICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsKPgo+ICAg ICAgICAgY3pfc211ID0gKHN0cnVjdCBjel9zbXVtZ3IgKilzbXVtZ3ItPmJhY2tlbmQ7Cj4gLSAg ICAgICBpZiAoIWN6X3NtdSkgewo+ICsgICAgICAgaWYgKGN6X3NtdSkgewo+ICAgICAgICAgICAg ICAgICBjZ3NfZnJlZV9ncHVfbWVtKHNtdW1nci0+ZGV2aWNlLAo+ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY3pfc211LT50b2NfYnVmZmVyLmhhbmRsZSk7Cj4gICAgICAgICAgICAg ICAgIGNnc19mcmVlX2dwdV9tZW0oc211bWdyLT5kZXZpY2UsCj4gX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4g ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK