From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 04 Jan 2016 20:42:55 +0000 Subject: [patch] drm/amd/powerplay: fix a reversed condition Message-Id: <20160104204255.GB19867@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie , Jammy Zhou Cc: Alex Deucher , kernel-janitors@vger.kernel.org, Rex Zhu , dri-devel@lists.freedesktop.org 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 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, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/amd/powerplay: fix a reversed condition Date: Mon, 4 Jan 2016 23:42:55 +0300 Message-ID: <20160104204255.GB19867@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59B646E0F0 for ; Mon, 4 Jan 2016 12:43:09 -0800 (PST) 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: David Airlie , Jammy Zhou Cc: Alex Deucher , kernel-janitors@vger.kernel.org, Rex Zhu , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyB0ZXN0IHdhcyByZXZlcnNlZCBzbyBpdCB3b3VsZCBlbmQgdXAgbGVhZGluZyB0byBhIE5V TEwgZGVyZWZlcmVuY2UuCgpGaXhlczogNDYzMGYwZmFhZTgwICgnZHJtL2FtZC9wb3dlcnBsYXk6 IGFkZCBDYXJyaXpvIHNtdSBzdXBwb3J0JykKU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8 ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvcG93ZXJwbGF5L3NtdW1nci9jel9zbXVtZ3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93 ZXJwbGF5L3NtdW1nci9jel9zbXVtZ3IuYwppbmRleCBlNzQwMjNiLi44NzNhOGQyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvY3pfc211bWdyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL2N6X3NtdW1nci5jCkBAIC04 MTgsNyArODE4LDcgQEAgc3RhdGljIGludCBjel9zbXVfZmluaShzdHJ1Y3QgcHBfc211bWdyICpz bXVtZ3IpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJY3pfc211ID0gKHN0cnVjdCBjel9zbXVtZ3Ig KilzbXVtZ3ItPmJhY2tlbmQ7Ci0JaWYgKCFjel9zbXUpIHsKKwlpZiAoY3pfc211KSB7CiAJCWNn c19mcmVlX2dwdV9tZW0oc211bWdyLT5kZXZpY2UsCiAJCQkJY3pfc211LT50b2NfYnVmZmVyLmhh bmRsZSk7CiAJCWNnc19mcmVlX2dwdV9tZW0oc211bWdyLT5kZXZpY2UsCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==