fbdev: Make pixel_to_pat() failure mode more friendly

If we accidentally pass an incorrect bpp value to pixel_to_pat(),
it panics. This is pretty useless, as we generally have the various
console locks held at that point, so nothing will be displayed,
and there is no reason to make this a fatal event.

Let's WARN instead.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>

diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h
index 04c01faaf7721b71041461f56c6b2032d3085d81..624ee115f129291a2fc3adfe9ff7b4781e19f0ac 100644 (file)
--- a/drivers/video/fb_draw.h
+++ b/drivers/video/fb_draw.h
@@ -3,6 +3,7 @@
 
 #include <asm/types.h>
 #include <linux/fb.h>
+#include <linux/bug.h>
 
     /*
      *  Compose two values, using a bitmask as decision value
@@ -41,7 +42,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
        case 32:
                return 0x0000000100000001ul*pixel;
        default:
-               panic("pixel_to_pat(): unsupported pixelformat\n");
+               WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
+               return 0;
     }
 }
 #else
@@ -66,7 +68,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
        case 32:
                return 0x00000001ul*pixel;
        default:
-               panic("pixel_to_pat(): unsupported pixelformat\n");
+               WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
+               return 0;
     }
 }
 #endif