summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-03-21 09:41:36 +0000
committerjsg <jsg@openbsd.org>2020-03-21 09:41:36 +0000
commit5ca7d8925ce0fd3139224bbef9a94b854d7d43d4 (patch)
tree7ebc3abc330f0ab818b0e97978902a2da0f27b47
parentStop tracing if vget(9) fails. (diff)
downloadwireguard-openbsd-5ca7d8925ce0fd3139224bbef9a94b854d7d43d4.tar.xz
wireguard-openbsd-5ca7d8925ce0fd3139224bbef9a94b854d7d43d4.zip
drm/amd/display: remove duplicated assignment to grph_obj_type
From Colin Ian King bef7177cefad180b9776ed49290d42bfb873da1e in linux 4.19.y/4.19.111 d785476c608c621b345dd9396e8b21e90375cb0e in mainline linux
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c
index 39539465054..c30899b9898 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c
@@ -364,8 +364,7 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device *
router.ddc_valid = false;
router.cd_valid = false;
for (j = 0; j < ((le16_to_cpu(path->usSize) - 8) / 2); j++) {
- uint8_t grph_obj_type=
- grph_obj_type =
+ uint8_t grph_obj_type =
(le16_to_cpu(path->usGraphicObjIds[j]) &
OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;