| From foo@baz Sun Aug 26 09:13:00 CEST 2018 |
| From: Lucas Stach <l.stach@pengutronix.de> |
| Date: Wed, 11 Apr 2018 17:31:36 +0200 |
| Subject: drm/imx: imx-ldb: check if channel is enabled before printing warning |
| |
| From: Lucas Stach <l.stach@pengutronix.de> |
| |
| [ Upstream commit c80d673b91a6c81d765864e10f2b15110ee900ad ] |
| |
| If the second LVDS channel has been disabled in the DT when using dual-channel |
| mode we should not print a warning. |
| |
| Signed-off-by: Lucas Stach <l.stach@pengutronix.de> |
| Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/imx/imx-ldb.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/gpu/drm/imx/imx-ldb.c |
| +++ b/drivers/gpu/drm/imx/imx-ldb.c |
| @@ -655,14 +655,14 @@ static int imx_ldb_bind(struct device *d |
| if (ret || i < 0 || i > 1) |
| return -EINVAL; |
| |
| + if (!of_device_is_available(child)) |
| + continue; |
| + |
| if (dual && i > 0) { |
| dev_warn(dev, "dual-channel mode, ignoring second output\n"); |
| continue; |
| } |
| |
| - if (!of_device_is_available(child)) |
| - continue; |
| - |
| channel = &imx_ldb->channel[i]; |
| channel->ldb = imx_ldb; |
| channel->chno = i; |