From 7cf09c9f314a485ed02d07ab887598a0637bb8d9 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Thu, 24 Jul 2008 22:53:28 +0200 Subject: [PATCH] --- yaml --- r: 105731 b: refs/heads/master c: dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394 h: refs/heads/master i: 105729: 7b1d25a2f5fa312d47ca9c34de31a3872637bd11 105727: bd744c028a94e53ba633f5b274e7d1a79af5f0f9 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-generic.c | 4 ++++ trunk/include/asm-mips/mach-generic/ide.h | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e1d00cffba25..d293b7f9361e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac32f3238c1d95a6ebea2c312160dbdbd61bf91c +refs/heads/master: dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394 diff --git a/trunk/drivers/ide/ide-generic.c b/trunk/drivers/ide/ide-generic.c index 31d98fec775f..567fd843c7ff 100644 --- a/trunk/drivers/ide/ide-generic.c +++ b/trunk/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/trunk/include/asm-mips/mach-generic/ide.h b/trunk/include/asm-mips/mach-generic/ide.h index 0f6c251f5fec..71a01c5aec16 100644 --- a/trunk/include/asm-mips/mach-generic/ide.h +++ b/trunk/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