aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:28 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:28 -0400
commitdbdec839c4c2bfc8f2da8e50c06b9947e5ad0394 (patch)
tree275b7dd6c07c5a6ecd0ee1b9c91b6a3ad407e2cc /drivers/ide
parentac32f3238c1d95a6ebea2c312160dbdbd61bf91c (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 'drivers/ide')
-rw-r--r--drivers/ide/ide-generic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 31d98fec775f..567fd843c7ff 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -87,6 +87,10 @@ static int __init ide_generic_init(void)
87 unsigned long io_addr; 87 unsigned long io_addr;
88 int i, rc; 88 int i, rc;
89 89
90#ifdef CONFIG_MIPS
91 if (!ide_probe_legacy())
92 return -ENODEV;
93#endif
90 printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module " 94 printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "
91 "parameter for probing all legacy ISA IDE ports\n"); 95 "parameter for probing all legacy ISA IDE ports\n");
92 96