From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/amdkfd: Fix a && vs || typo Date: Mon, 7 Oct 2019 11:52:10 +0300 Message-ID: <20191007085210.GC3865@mwanda> 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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Felix Kuehling , Yong Zhao Cc: David Airlie , kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= List-Id: amd-gfx.lists.freedesktop.org SW4gdGhlIGN1cnJlbnQgY29kZSBpZiAiZGV2aWNlX2luZm8iIGlzIGV2ZXIgTlVMTCB0aGVuIHRo ZSBrZXJuZWwgd2lsbApPb3BzIHNvIHByb2JhYmx5IHx8IHdhcyBpbnRlbmRlZCBpbnN0ZWFkIG9m ICYmLgoKRml4ZXM6IGUzOTJjODg3ZGY5NyAoImRybS9hbWRrZmQ6IFVzZSBhcnJheSB0byBwcm9i ZSBrZmQya2dkX2NhbGxzIikKU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBl bnRlckBvcmFjbGUuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZp Y2UuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2UuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2UuYwppbmRleCAwZGIyNzM1ODdh ZjQuLjA3MGM5YjU1OTNjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQv a2ZkX2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2Uu YwpAQCAtNDk4LDcgKzQ5OCw3IEBAIHN0cnVjdCBrZmRfZGV2ICprZ2Qya2ZkX3Byb2JlKHN0cnVj dCBrZ2RfZGV2ICprZ2QsCiAJZGV2aWNlX2luZm8gPSBrZmRfc3VwcG9ydGVkX2RldmljZXNbYXNp Y190eXBlXVt2Zl07CiAJZjJnID0ga2ZkMmtnZF9mdW5jc1thc2ljX3R5cGVdOwogCi0JaWYgKCFk ZXZpY2VfaW5mbyAmJiAhZjJnKSB7CisJaWYgKCFkZXZpY2VfaW5mbyB8fCAhZjJnKSB7CiAJCWRl dl9lcnIoa2ZkX2RldmljZSwgIiVzICVzIG5vdCBzdXBwb3J0ZWQgaW4ga2ZkXG4iLAogCQkJYW1k Z3B1X2FzaWNfbmFtZVthc2ljX3R5cGVdLCB2ZiA/ICJWRiIgOiAiIik7CiAJCXJldHVybiBOVUxM OwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 07 Oct 2019 08:52:10 +0000 Subject: [PATCH] drm/amdkfd: Fix a && vs || typo Message-Id: <20191007085210.GC3865@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Felix Kuehling , Yong Zhao Cc: David Airlie , kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= In the current code if "device_info" is ever NULL then the kernel will Oops so probably || was intended instead of &&. Fixes: e392c887df97 ("drm/amdkfd: Use array to probe kfd2kgd_calls") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index 0db273587af4..070c9b5593c9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -498,7 +498,7 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, device_info = kfd_supported_devices[asic_type][vf]; f2g = kfd2kgd_funcs[asic_type]; - if (!device_info && !f2g) { + if (!device_info || !f2g) { dev_err(kfd_device, "%s %s not supported in kfd\n", amdgpu_asic_name[asic_type], vf ? "VF" : ""); return NULL; -- 2.20.1