---

yaml --- r: 321095 b: refs/heads/master c: 3f6a558 h: refs/heads/master i: 321093: cbdf18a 321091: 17cf90f 321087: db7025c v: v3
git-mirror · Jul 29, 2012 · 1aed6f9 · 1aed6f9
1 parent 9bed969
commit 1aed6f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7c848b6ef31af09925bb6f4c79e236ca9f94ed9
+refs/heads/master: 3f6a5580464bf000649f981970192c6c7fe739de
diff --git a/trunk/drivers/video/fb_draw.h b/trunk/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