video: omap: fix pixel-per-line bitfield setting

[oweals/u-boot.git] / drivers / video / bcm2835.c

diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 952ef5966118ce4f1ea90149120fc19bad93942b..1d2eda084c87619cd3546da691e099185e08ee77 100644 (file)
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2012 Stephen Warren
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -20,13 +19,15 @@ static int bcm2835_video_probe(struct udevice *dev)
 
        debug("bcm2835: Query resolution...\n");
        ret = bcm2835_get_video_size(&w, &h);
-       if (ret)
+       if (ret || w == 0 || h == 0)
                return -EIO;
 
        debug("bcm2835: Setting up display for %d x %d\n", w, h);
        ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB,
                                       BCM2835_MBOX_ALPHA_MODE_IGNORED,
                                       &fb_base, &fb_size, &pitch);
+       if (ret)
+               return -EIO;
 
        debug("bcm2835: Final resolution is %d x %d\n", w, h);
 
@@ -49,6 +50,7 @@ static int bcm2835_video_probe(struct udevice *dev)
 
 static const struct udevice_id bcm2835_video_ids[] = {
        { .compatible = "brcm,bcm2835-hdmi" },
+       { .compatible = "brcm,bcm2708-fb" },
        { }
 };