diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 20:47:15 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 13:28:49 -0700 |
commit | d6497700879beeaaae208c0e9fd10b74dc44db5e (patch) | |
tree | dfa0b6710bfa9212c5aa7deed02c7b7ef49e40ff /drivers/video/dnfb.c | |
parent | 3ce92a2a7b03dae6b7778e2a5ff52f2042512887 (diff) | |
download | kernel-crypto-d6497700879beeaaae208c0e9fd10b74dc44db5e.tar.gz kernel-crypto-d6497700879beeaaae208c0e9fd10b74dc44db5e.tar.xz kernel-crypto-d6497700879beeaaae208c0e9fd10b74dc44db5e.zip |
m68k: dnfb doesnt check for Apollo
The Apollo frame buffer device driver (dnfb) doesn't check whether it's
actually running on Apollo hardware, causing a crash if it isn't.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/dnfb.c')
-rw-r--r-- | drivers/video/dnfb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c index b083ea7e9c6..606da043f4b 100644 --- a/drivers/video/dnfb.c +++ b/drivers/video/dnfb.c @@ -284,6 +284,9 @@ int __init dnfb_init(void) { int ret; + if (!MACH_IS_APOLLO) + return -ENODEV; + if (fb_get_options("dnfb", NULL)) return -ENODEV; |