releases/4.4.154/drm-imx-imx-ldb-check-if-channel-is-enabled-before-printing-warning.patch

   1 From foo@baz Tue Aug 28 16:10:37 CEST 2018
   2 From: Lucas Stach <l.stach@pengutronix.de>
   3 Date: Wed, 11 Apr 2018 17:31:36 +0200
   4 Subject: drm/imx: imx-ldb: check if channel is enabled before printing warning
   5
   6 From: Lucas Stach <l.stach@pengutronix.de>
   7
   8 [ Upstream commit c80d673b91a6c81d765864e10f2b15110ee900ad ]
   9
  10 If the second LVDS channel has been disabled in the DT when using dual-channel
  11 mode we should not print a warning.
  12
  13 Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
  14 Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  15 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17 ---
  18  drivers/gpu/drm/imx/imx-ldb.c |    6 +++---
  19  1 file changed, 3 insertions(+), 3 deletions(-)
  20
  21 --- a/drivers/gpu/drm/imx/imx-ldb.c
  22 +++ b/drivers/gpu/drm/imx/imx-ldb.c
  23 @@ -569,14 +569,14 @@ static int imx_ldb_bind(struct device *d
  24                 if (ret || i < 0 || i > 1)
  25                         return -EINVAL;
  26
  27 +               if (!of_device_is_available(child))
  28 +                       continue;
  29 +
  30                 if (dual && i > 0) {
  31                         dev_warn(dev, "dual-channel mode, ignoring second output\n");
  32                         continue;
  33                 }
  34
  35 -               if (!of_device_is_available(child))
  36 -                       continue;
  37 -
  38                 channel = &imx_ldb->channel[i];
  39                 channel->ldb = imx_ldb;
  40                 channel->chno = i;