2 files changed, 20 insertions, 3 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index d37a2680ceed..da6025cfa09a 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1530,8 +1530,7 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
 
                 hwif = &ide_hwifs[idx[i]];
 
-                if ((hwif->chipset != ide_4drives || !hwif->mate ||
-                     !hwif->mate->present) && ide_hwif_request_regions(hwif)) {
+                if (ide_hwif_request_regions(hwif)) {
                         printk(KERN_ERR "%s: ports already in use, "
                                         "skipping probe\n", hwif->name);
                         continue;
diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index c352f12348af..e69566284ab7 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -4,6 +4,8 @@
 #include <linux/module.h>
 #include <linux/ide.h>
 
+#define DRV_NAME "ide-4drives"
+
 int probe_4drives;
 
 module_param_named(probe, probe_4drives, bool, 0);
@@ -12,21 +14,36 @@ MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 static int __init ide_4drives_init(void)
 {
         ide_hwif_t *hwif, *mate;
+        unsigned long base = 0x1f0, ctl = 0x3f6;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         hw_regs_t hw;
 
         if (probe_4drives == 0)
                 return -ENODEV;
 
+        if (!request_region(base, 8, DRV_NAME)) {
+                printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
+                                DRV_NAME, base, base + 7);
+                return -EBUSY;
+        }
+
+        if (!request_region(ctl, 1, DRV_NAME)) {
+                printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",
+                                DRV_NAME, ctl);
+                release_region(base, 8);
+                return -EBUSY;
+        }
+
         memset(&hw, 0, sizeof(hw));
 
-        ide_std_init_ports(&hw, 0x1f0, 0x3f6);
+        ide_std_init_ports(&hw, base, ctl);
         hw.irq = 14;
         hw.chipset = ide_4drives;
 
         hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw);
+                hwif->mmio = 1;
                 idx[0] = hwif->index;
         }
 
@@ -35,6 +52,7 @@ static int __init ide_4drives_init(void)
                 ide_init_port_hw(mate, &hw);
                 mate->drives[0].select.all ^= 0x20;
                 mate->drives[1].select.all ^= 0x20;
+                mate->mmio = 1;
                 idx[1] = mate->index;
 
                 if (hwif) {