diff options
| author | Linus Torvalds | 2009-12-08 17:13:35 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-12-08 17:13:35 +0100 |
| commit | adf9904dc774f23f04a5425f0198483ea61f878b (patch) | |
| tree | dfe0527c7f3877eb4d155ddb20fd303c1d8328c0 /drivers/video | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | m68k: parport_mfc3 - Not makes it a bool before the comparison. (diff) | |
| download | kernel-qcow2-linux-adf9904dc774f23f04a5425f0198483ea61f878b.tar.gz kernel-qcow2-linux-adf9904dc774f23f04a5425f0198483ea61f878b.tar.xz kernel-qcow2-linux-adf9904dc774f23f04a5425f0198483ea61f878b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: parport_mfc3 - Not makes it a bool before the comparison.
m68k: don't export static inline functions
fbdev: atafb - add palette register check
m68k: Remove the BKL from sys_execve
m68k: Cleanup linker scripts using new linker script macros.
m68k: Make thread_info.h usable from assembly.
m68knommu: define arch_has_single_step() and friends
m68k: ptrace fixes
m68k: use generic code for ptrace requests
rtc: Add an RTC driver for the Ricoh RP5C01
rtc: Add an RTC driver for the Oki MSM6242
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/atafb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 37624f74e88b..b7687c55fe16 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -2242,6 +2242,9 @@ static int ext_setcolreg(unsigned int regno, unsigned int red, if (!external_vgaiobase) return 1; + if (regno > 255) + return 1; + switch (external_card_type) { case IS_VGA: OUTB(0x3c8, regno); |