In message: [linux-yocto] drm/bridge: adv7511: Fix incorrect merge conflict
resolutions in adv7511_probe()
on 28/04/2024 Kevin Hao wrote:
> From: Kevin Hao <kexin....@windriver.com>
>
> When merging b140d9d4515f ("drm/bridge: adv7511: fix crash on irq during
> probe") into nxp branches, it conflicts with the SDK commit ad93dd09fbbe
> ("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....@windriver.com>
> ---
> Hi Bruce,
>
> Please help me merge this into the following two branches:
> v6.1/standard/nxp-sdk-6.1/nxp-soc
> v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
merged.
Bruce
>
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 6e90871267f1..aba1fea6c22c 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1422,13 +1422,7 @@ static int adv7511_probe(struct i2c_client *i2c, const
> struct i2c_device_id *id)
> IRQF_ONESHOT, dev_name(dev),
> adv7511);
> if (ret)
> - goto err_unregister_audio;
> - }
> -
> - if (adv7511->type == ADV7533 || adv7511->type == ADV7535) {
> - ret = adv7533_attach_dsi(adv7511);
> - if (ret)
> - goto err_unregister_audio;
> + goto err_unregister_cec;
> }
>
> return 0;
> --
> 2.44.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13881):
https://lists.yoctoproject.org/g/linux-yocto/message/13881
Mute This Topic: https://lists.yoctoproject.org/mt/105779474/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
