Skip to content

Commit d315d67

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 e1a2285 commit d315d67

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
@@ -230,12 +230,10 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
230230
vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
231231

232232
ret = connector_status_connected;
233-
goto out;
233+
} else {
234+
cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
234235
}
235236

236-
cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
237-
238-
out:
239237
pm_runtime_put(&vc4_hdmi->pdev->dev);
240238
mutex_unlock(&vc4_hdmi->mutex);
241239
return ret;

0 commit comments

Comments
 (0)