diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-09-27 04:09:06 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-09-27 04:09:06 +0000 |
| commit | 1b2f441591814d084557ba9f6bf7f9c34808ec6e (patch) | |
| tree | f54d50c8520d12811bf5fcbe363c75451160fea4 /sys/dev | |
| parent | 35e2d4af30413cbd3fd1e011685faf3dfb823ace (diff) | |
drm/dp_mst: Fix return code on sideband message failure
From Rajkumar Subbiah
bb693c114e8b53e3e0b8228be218d907d35959a5 in linux 5.10.y/5.10.67
92bd92c44d0d9be5dcbcda315b4be4b909ed9740 in mainline linux
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/drm_dp_mst_topology.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/drm_dp_mst_topology.c b/sys/dev/pci/drm/drm_dp_mst_topology.c index f79d0804f8a..7969daffda3 100644 --- a/sys/dev/pci/drm/drm_dp_mst_topology.c +++ b/sys/dev/pci/drm/drm_dp_mst_topology.c @@ -2879,11 +2879,13 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, idx += tosend + 1; ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx); - if (unlikely(ret) && drm_debug_enabled(DRM_UT_DP)) { - struct drm_printer p = drm_debug_printer(DBG_PREFIX); + if (ret) { + if (drm_debug_enabled(DRM_UT_DP)) { + struct drm_printer p = drm_debug_printer(DBG_PREFIX); - drm_printf(&p, "sideband msg failed to send\n"); - drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); + drm_printf(&p, "sideband msg failed to send\n"); + drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); + } return ret; } |