diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 14:47:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 16:28:49 -0400 |
| commit | d6497700879beeaaae208c0e9fd10b74dc44db5e (patch) | |
| tree | dfa0b6710bfa9212c5aa7deed02c7b7ef49e40ff | |
| parent | 3ce92a2a7b03dae6b7778e2a5ff52f2042512887 (diff) | |
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>
| -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 b083ea7e9c69..606da043f4b4 100644 --- a/drivers/video/dnfb.c +++ b/drivers/video/dnfb.c | |||
| @@ -284,6 +284,9 @@ int __init dnfb_init(void) | |||
| 284 | { | 284 | { |
| 285 | int ret; | 285 | int ret; |
| 286 | 286 | ||
| 287 | if (!MACH_IS_APOLLO) | ||
| 288 | return -ENODEV; | ||
| 289 | |||
| 287 | if (fb_get_options("dnfb", NULL)) | 290 | if (fb_get_options("dnfb", NULL)) |
| 288 | return -ENODEV; | 291 | return -ENODEV; |
| 289 | 292 | ||
