aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-05-18 14:47:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-18 16:28:49 -0400
commit3ce92a2a7b03dae6b7778e2a5ff52f2042512887 (patch)
treebfb0e307e34dd9791f1984a806ba2c1746cfaaf3 /drivers
parent3f365e8ee90bf835553ea964ba5accf5b8ba4070 (diff)
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')
-rw-r--r--drivers/ide/legacy/macide.c3
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)
95 int irq; 95 int irq;
96 hw_regs_t hw; 96 hw_regs_t hw;
97 97
98 if (!MACH_IS_MAC)
99 return -ENODEV;
100
98 switch (macintosh_config->ide_type) { 101 switch (macintosh_config->ide_type) {
99 case MAC_IDE_QUADRA: 102 case MAC_IDE_QUADRA:
100 base = IDE_BASE; 103 base = IDE_BASE;