diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4037-drm-amdkfd-Fix-a-vs-typo.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4037-drm-amdkfd-Fix-a-vs-typo.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4037-drm-amdkfd-Fix-a-vs-typo.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4037-drm-amdkfd-Fix-a-vs-typo.patch new file mode 100644 index 00000000..d7b6bcb9 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4037-drm-amdkfd-Fix-a-vs-typo.patch @@ -0,0 +1,31 @@ +From 61818f65cd061d7dc151b07a6890f89959a73b15 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter <dan.carpenter@oracle.com> +Date: Mon, 7 Oct 2019 11:52:10 +0300 +Subject: [PATCH 4037/4256] drm/amdkfd: Fix a && vs || typo + +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 <dan.carpenter@oracle.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + 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 bdf890912ff8..24728e70e871 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -504,7 +504,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.17.1 + |