Skip to content

Commit 48904c9

Browse files
committed
drm/vc4: Remove a goto which was really skipping an "else" clause
The code in vc4_hdmi_connector_detect was doing a goto to jump to exit code, but it was only stepping over one line which was effectively an "else" clause to the "if" being checked. Swap to an else clause. Signed-off-by: Dave Stevenson <[email protected]>
1 parent 72dfa57 commit 48904c9

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,10 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
227227
vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
228228

229229
ret = connector_status_connected;
230-
goto out;
230+
} else {
231+
cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
231232
}
232233

233-
cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
234-
235-
out:
236234
pm_runtime_put(&vc4_hdmi->pdev->dev);
237235
mutex_unlock(&vc4_hdmi->mutex);
238236
return ret;

0 commit comments

Comments
 (0)