Skip to content
Commit 2843fb9c authored by Kevin Hao's avatar Kevin Hao Committed by Bruce Ashfield
Browse files

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: default avatarKevin Hao <kexin.hao@windriver.com>
Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>
parent e4c8f496
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment