lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fbdev: Make pixel_to_pat() failure mode more friendly

Browse Source 
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>
This commit is contained in:
Benjamin Herrenschmidt
2012-07-24 18:19:13 +10:00
committed by Florian Tobias Schandinat
parent f7c848b6ef
commit 3f6a558046
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/fb_draw.h
View File

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