projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f365e8
)
m68k: macide doesnt check for Mac
author
Geert Uytterhoeven
<geert@linux-m68k.org>
Sun, 18 May 2008 18:47:14 +0000
(20:47 +0200)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 18 May 2008 20:28:49 +0000
(13:28 -0700)
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>
drivers/ide/legacy/macide.c
patch
|
blob
|
history
diff --git
a/drivers/ide/legacy/macide.c
b/drivers/ide/legacy/macide.c
index
1f527bb
..
caa2632
100644
(file)
--- 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;