summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-18 11:49:53 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-05-22 10:59:15 +0300
commit3cb6a1b9672a2e0937a1475e3d68e6c236133156 (patch)
treebe69080b3a27b0221c0a30aa1871ba24bf2be3fb /drivers/video
parent4a75cb857d2ec5f8f40f23a817ec162b93661bae (diff)
downloadlinux-3cb6a1b9672a2e0937a1475e3d68e6c236133156.tar.gz
linux-3cb6a1b9672a2e0937a1475e3d68e6c236133156.tar.bz2
linux-3cb6a1b9672a2e0937a1475e3d68e6c236133156.zip
OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG=n
If CONFIG_BUG is not enabled, BUG() does not stop the execution. Many places in code expect the execution to stop, and this causes compiler warnings about uninitialized variables and returning from a non-void function without a return value. This patch fixes the warnings by initializing the variables and returning properly after BUG() lines. However, the behaviour is still undefined after the BUG, but this is the choice the user makes when using CONFIG_BUG=n. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/vrfb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/omap2/vrfb.c b/drivers/video/omap2/vrfb.c
index 4e5b960c32c8..7e990220ad2a 100644
--- a/drivers/video/omap2/vrfb.c
+++ b/drivers/video/omap2/vrfb.c
@@ -179,8 +179,10 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
pixel_size_exp = 2;
else if (bytespp == 2)
pixel_size_exp = 1;
- else
+ else {
BUG();
+ return;
+ }
vrfb_width = ALIGN(width * bytespp, VRFB_PAGE_WIDTH) / bytespp;
vrfb_height = ALIGN(height, VRFB_PAGE_HEIGHT);