diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 22:53:28 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 22:53:28 +0200 |
| commit | dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394 (patch) | |
| tree | 275b7dd6c07c5a6ecd0ee1b9c91b6a3ad407e2cc | |
| parent | ac32f3238c1d95a6ebea2c312160dbdbd61bf91c (diff) | |
| download | linux-3.10-dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394.tar.gz linux-3.10-dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394.tar.bz2 linux-3.10-dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394.zip | |
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>
| -rw-r--r-- | drivers/ide/ide-generic.c | 4 | ||||
| -rw-r--r-- | include/asm-mips/mach-generic/ide.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 31d98fec775..567fd843c7f 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c @@ -87,6 +87,10 @@ static int __init ide_generic_init(void) unsigned long io_addr; int i, rc; +#ifdef CONFIG_MIPS + if (!ide_probe_legacy()) + return -ENODEV; +#endif printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module " "parameter for probing all legacy ISA IDE ports\n"); diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index 0f6c251f5fe..71a01c5aec1 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) static __inline__ unsigned long ide_default_io_base(int index) { - if (!ide_probe_legacy()) - return 0; /* * If PCI is present then it is not safe to poke around * the other legacy IDE ports. Only 0x1f0 and 0x170 are |