Commit d82a5a4a authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Neil Armstrong
Browse files

drm/meson: encoder_hdmi: Fix refcount leak in meson_encoder_hdmi_init 



of_graph_get_remote_node() returns remote device nodepointer with
refcount incremented, we should use of_node_put() on it when done.
Add missing of_node_put() to avoid refcount leak.

Fixes: e67f6037 ("drm/meson: split out encoder from meson_dw_hdmi")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220601033927.47814-3-linmq006@gmail.com
parent 7d255ddb

drivers/gpu/drm/meson/meson_encoder_hdmi.c

+11 −4
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) 
	meson_encoder_hdmi->next_bridge = of_drm_find_bridge(remote);

	if (!meson_encoder_hdmi->next_bridge) {

		dev_err(priv->dev, "Failed to find HDMI transceiver bridge\n");

		return -EPROBE_DEFER;

		ret = -EPROBE_DEFER;

		goto err_put_node;

	}



	/* HDMI Encoder Bridge */
@@ -389,7 +390,7 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) 
				      DRM_MODE_ENCODER_TMDS);

	if (ret) {

		dev_err(priv->dev, "Failed to init HDMI encoder: %d\n", ret);

		return ret;

		goto err_put_node;

	}



	meson_encoder_hdmi->encoder.possible_crtcs = BIT(0);
@@ -399,7 +400,7 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) 
				DRM_BRIDGE_ATTACH_NO_CONNECTOR);

	if (ret) {

		dev_err(priv->dev, "Failed to attach bridge: %d\n", ret);

		return ret;

		goto err_put_node;

	}



	/* Initialize & attach Bridge Connector */
@@ -407,7 +408,8 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) 
							&meson_encoder_hdmi->encoder);

	if (IS_ERR(meson_encoder_hdmi->connector)) {

		dev_err(priv->dev, "Unable to create HDMI bridge connector\n");

		return PTR_ERR(meson_encoder_hdmi->connector);

		ret = PTR_ERR(meson_encoder_hdmi->connector);

		goto err_put_node;

	}

	drm_connector_attach_encoder(meson_encoder_hdmi->connector,

				     &meson_encoder_hdmi->encoder);
@@ -434,6 +436,7 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) 
	meson_encoder_hdmi->connector->ycbcr_420_allowed = true;



	pdev = of_find_device_by_node(remote);

	of_node_put(remote);

	if (pdev) {

		struct cec_connector_info conn_info;

		struct cec_notifier *notifier;
@@ -452,4 +455,8 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) 
	dev_dbg(priv->dev, "HDMI encoder initialized\n");



	return 0;



err_put_node:

	of_node_put(remote);

	return ret;

}