[PATCH v2 1/3] drm/mediatek: exit earlier if failed to register audio driver
CK Hu
ck.hu at mediatek.com
Fri Feb 7 09:34:17 UTC 2020
Hi, Tzung-Bi:
On Thu, 2020-02-06 at 11:17 +0800, Tzung-Bi Shih wrote:
> Exits earlier if register_audio_driver() returns errors.
>
Acked-by: CK Hu <ck.hu at mediatek.com>
> Signed-off-by: Tzung-Bi Shih <tzungbi at google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index c79b1f855d89..23c2b0e8693d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1656,7 +1656,7 @@ static const struct hdmi_codec_ops mtk_hdmi_audio_codec_ops = {
> .get_eld = mtk_hdmi_audio_get_eld,
> };
>
> -static void mtk_hdmi_register_audio_driver(struct device *dev)
> +static int mtk_hdmi_register_audio_driver(struct device *dev)
> {
> struct hdmi_codec_pdata codec_data = {
> .ops = &mtk_hdmi_audio_codec_ops,
> @@ -1669,9 +1669,10 @@ static void mtk_hdmi_register_audio_driver(struct device *dev)
> PLATFORM_DEVID_AUTO, &codec_data,
> sizeof(codec_data));
> if (IS_ERR(pdev))
> - return;
> + return PTR_ERR(pdev);
>
> DRM_INFO("%s driver bound to HDMI\n", HDMI_CODEC_DRV_NAME);
> + return 0;
> }
>
> static int mtk_drm_hdmi_probe(struct platform_device *pdev)
> @@ -1705,7 +1706,11 @@ static int mtk_drm_hdmi_probe(struct platform_device *pdev)
> return ret;
> }
>
> - mtk_hdmi_register_audio_driver(dev);
> + ret = mtk_hdmi_register_audio_driver(dev);
> + if (ret) {
> + dev_err(dev, "Failed to register audio driver: %d\n", ret);
> + return ret;
> + }
>
> hdmi->bridge.funcs = &mtk_hdmi_bridge_funcs;
> hdmi->bridge.of_node = pdev->dev.of_node;
More information about the dri-devel
mailing list