Commit dbdec839 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ac32f323
...@@ -87,6 +87,10 @@ static int __init ide_generic_init(void) ...@@ -87,6 +87,10 @@ static int __init ide_generic_init(void)
unsigned long io_addr; unsigned long io_addr;
int i, rc; int i, rc;
#ifdef CONFIG_MIPS
if (!ide_probe_legacy())
return -ENODEV;
#endif
printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module " printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "
"parameter for probing all legacy ISA IDE ports\n"); "parameter for probing all legacy ISA IDE ports\n");
......
...@@ -72,8 +72,6 @@ static __inline__ int ide_default_irq(unsigned long base) ...@@ -72,8 +72,6 @@ static __inline__ int ide_default_irq(unsigned long base)
static __inline__ unsigned long ide_default_io_base(int index) 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 * If PCI is present then it is not safe to poke around
* the other legacy IDE ports. Only 0x1f0 and 0x170 are * the other legacy IDE ports. Only 0x1f0 and 0x170 are
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment