diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:05 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:05 +0200 |
| commit | 3afde26594c49c6a4c7e0c71911846dd0f85f747 (patch) | |
| tree | 5db35890acc316c52d6bba7523247c23fe785ff9 /drivers | |
| parent | af761c05af1e68efcbac67fa29d93087173341ce (diff) | |
| parent | 23156709b4e5787050adb55dd7ea38b5ae672441 (diff) | |
| download | barebox-3afde26594c49c6a4c7e0c71911846dd0f85f747.tar.gz barebox-3afde26594c49c6a4c7e0c71911846dd0f85f747.tar.xz | |
Merge branch 'for-next/fb'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/fb.c | 3 | ||||
| -rw-r--r-- | drivers/video/imx-ipu-v3/imx-ldb.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/fb.c b/drivers/video/fb.c index 5e829e832d..c9d184d502 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -124,6 +124,9 @@ static int fb_enable_set(struct param_d *param, void *priv) struct fb_info *info = priv; int enable; + if (!info->mode) + return -EINVAL; + enable = info->p_enable; if (enable) diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c index 33dbade870..9b4524274c 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -347,7 +347,7 @@ static int imx_ldb_probe(struct device_d *dev) return -EINVAL; if (dual && i > 0) { - dev_warn(dev, "dual-channel mode, ignoring second output\n"); + dev_info(dev, "dual-channel mode, ignoring second output\n"); continue; } |