diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:28 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:28 -0400 |
commit | dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394 (patch) | |
tree | 275b7dd6c07c5a6ecd0ee1b9c91b6a3ad407e2cc /include/asm-mips/mach-generic | |
parent | ac32f3238c1d95a6ebea2c312160dbdbd61bf91c (diff) |
ide-generic: minor fix for mips
Move ide_probe_legacy() call to ide_generic_init() so it fails
early if necessary and returns the proper error value (nowadays
ide_default_io_base() is used only by ide-generic).
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/asm-mips/mach-generic')
-rw-r--r-- | include/asm-mips/mach-generic/ide.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index 0f6c251f5fec..71a01c5aec16 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h | |||
@@ -72,8 +72,6 @@ static __inline__ int ide_default_irq(unsigned long base) | |||
72 | 72 | ||
73 | static __inline__ unsigned long ide_default_io_base(int index) | 73 | static __inline__ unsigned long ide_default_io_base(int index) |
74 | { | 74 | { |
75 | if (!ide_probe_legacy()) | ||
76 | return 0; | ||
77 | /* | 75 | /* |
78 | * If PCI is present then it is not safe to poke around | 76 | * If PCI is present then it is not safe to poke around |
79 | * the other legacy IDE ports. Only 0x1f0 and 0x170 are | 77 | * the other legacy IDE ports. Only 0x1f0 and 0x170 are |