diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-12-18 10:15:12 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-12-18 10:15:12 +0300 |
| commit | 500050f0d28868af302a3c24d7d1d0191521286e (patch) | |
| tree | 7c4366836fcf5c7d7be4292f60d76876b3c463a0 /drivers/gpu/drm/imx/imx-ldb.c | |
| parent | c0bc969c176b10598b31d5d1a5edf9a5261f0a9f (diff) | |
| parent | 6efac0173cd15460b48c91e1b0a000379f341f00 (diff) | |
| download | linux-500050f0d28868af302a3c24d7d1d0191521286e.tar.xz | |
Merge branch 'fixes-omap3' into fixes
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index af757d1e21fe..41e2978cb1eb 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -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, |