diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-05-18 20:47:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-18 13:28:49 -0700 |
| commit | 3ce92a2a7b03dae6b7778e2a5ff52f2042512887 (patch) | |
| tree | bfb0e307e34dd9791f1984a806ba2c1746cfaaf3 /drivers/ide/legacy/macide.c | |
| parent | 3f365e8ee90bf835553ea964ba5accf5b8ba4070 (diff) | |
| download | blackbird-op-linux-3ce92a2a7b03dae6b7778e2a5ff52f2042512887.tar.gz blackbird-op-linux-3ce92a2a7b03dae6b7778e2a5ff52f2042512887.zip | |
m68k: macide doesnt check for Mac
The Macintosh IDE driver (macide) doesn't check whether it's actually running
on Mac 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/ide/legacy/macide.c')
| -rw-r--r-- | drivers/ide/legacy/macide.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index 1f527bbf8d96..caa2632dd08e 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c @@ -95,6 +95,9 @@ static int __init macide_init(void) int irq; hw_regs_t hw; + if (!MACH_IS_MAC) + return -ENODEV; + switch (macintosh_config->ide_type) { case MAC_IDE_QUADRA: base = IDE_BASE; |
