drm/imx: imx-ldb: reduce scope of edid_len (754e0b58) · Commits · 戴 / test

drivers/gpu/drm/imx/imx-ldb.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ struct imx_ldb_channel {
		struct i2c_adapter *ddc;
		int chno;
		void *edid;
		int edid_len;
		struct drm_display_mode mode;
		int mode_valid;
		u32 bus_format;
		@@ -536,15 +535,14 @@ static int imx_ldb_panel_ddc(struct device *dev,
		}

		if (!channel->ddc) {
		int edid_len;

		/* if no DDC available, fallback to hardcoded EDID */
		dev_dbg(dev, "no ddc available\n");

		edidp = of_get_property(child, "edid",
		&channel->edid_len);
		edidp = of_get_property(child, "edid", &edid_len);
		if (edidp) {
		channel->edid = kmemdup(edidp,
		channel->edid_len,
		GFP_KERNEL);
		channel->edid = kmemdup(edidp, edid_len, GFP_KERNEL);
		} else if (!channel->panel) {
		/* fallback to display-timings node */
		ret = of_get_drm_display_mode(child,