From ce3cca110cc89cc509cb78f5c1b8a3acf9fadd72 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 18 May 2012 11:48:28 +0300 Subject: [PATCH] --- yaml --- r: 310370 b: refs/heads/master c: 4a75cb857d2ec5f8f40f23a817ec162b93661bae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/omapfb/omapfb-main.c | 1 + trunk/drivers/video/omap2/omapfb/omapfb.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 353d7296d64d..33f6b78354ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6eee968d40d319f0ac7a8a63dcbc633d9e6a2ea +refs/heads/master: 4a75cb857d2ec5f8f40f23a817ec162b93661bae diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c index 165a4be95025..3450ea0966c9 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c +++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c @@ -179,6 +179,7 @@ static unsigned omapfb_get_vrfb_offset(const struct omapfb_info *ofbi, int rot) break; default: BUG(); + return 0; } offset *= vrfb->bytespp; diff --git a/trunk/drivers/video/omap2/omapfb/omapfb.h b/trunk/drivers/video/omap2/omapfb/omapfb.h index c0bdc9b54ecf..30361a09aecd 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb.h +++ b/trunk/drivers/video/omap2/omapfb/omapfb.h @@ -166,6 +166,7 @@ static inline struct omapfb_display_data *get_display_data( /* This should never happen */ BUG(); + return NULL; } static inline void omapfb_lock(struct omapfb2_device *fbdev)