drm/bridge: adv7511: Fix incorrect merge conflict resolutions in adv7511_probe()
When merging b140d9d4 ("drm/bridge: adv7511: fix crash on irq during probe") into nxp branches, it conflicts with the SDK commit ad93dd09 ("Revert "drm/bridge: adv7511: Register and attach our DSI device at probe""). The current merge resolutions introduced two issues: - Part of codes deleted by SDK commit was restored mistakenly. - Reference of the label deleted by SDK commit. Resolve them to fix the build errors. Signed-off-by:Kevin Hao <kexin.hao@windriver.com> Signed-off-by:
Bruce Ashfield <bruce.ashfield@gmail.com>
Loading
Please register or sign in to comment