From a08a7cc5321a9c28a89d9bd11b0680862fc13aee Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <eo@nebensachen.de>
Date: Mon, 13 Oct 2008 21:39:45 +0200
Subject: [PATCH] --- yaml --- r: 114207 b: refs/heads/master c:
 e415e495f8294e536e09e6a15fba897cce4c0748 h: refs/heads/master i:   114205:
 e2e5062aa50e5671f46c882458b3fb31a866743b   114203:
 2bfd5eb774e8ce8097e7bb244aa639d8571e5dcb   114199:
 0bebe0b6ea16ccbe5c7feb21e3c8c2df45d6959c   114191:
 fe185800ecc82787423becb51725349fab705ed4   114175:
 d406eedace545c76c0fb1c871131a0fc82a24f39 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/ide/ide-io.c    |  5 +----
 trunk/drivers/ide/ide-probe.c | 20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7081058a41f0..ac69e2430961 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06b89518fa69fb7243dc98c31f9a9cfa61bfe788
+refs/heads/master: e415e495f8294e536e09e6a15fba897cce4c0748
diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c
index d0579f1abddd..e205f46c3c7a 100644
--- a/trunk/drivers/ide/ide-io.c
+++ b/trunk/drivers/ide/ide-io.c
@@ -655,10 +655,7 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting,
 	if (!(setting->flags & DS_SYNC))
 		return setting->set(drive, arg);
 
-	rq = blk_get_request(q, READ, GFP_KERNEL);
-	if (!rq)
-		return -ENOMEM;
-
+	rq = blk_get_request(q, READ, __GFP_WAIT);
 	rq->cmd_type = REQ_TYPE_SPECIAL;
 	rq->cmd_len = 5;
 	rq->cmd[0] = REQ_DEVSET_EXEC;
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index bce427ee08aa..de8edd306c79 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -958,9 +958,9 @@ static void ide_add_drive_to_hwgroup(ide_drive_t *drive)
  * - allocate the block device queue
  * - link drive into the hwgroup
  */
-static void ide_port_setup_devices(ide_hwif_t *hwif)
+static int ide_port_setup_devices(ide_hwif_t *hwif)
 {
-	int i;
+	int i, j = 0;
 
 	mutex_lock(&ide_cfg_mtx);
 	for (i = 0; i < MAX_DRIVES; i++) {
@@ -972,12 +972,19 @@ static void ide_port_setup_devices(ide_hwif_t *hwif)
 		if (ide_init_queue(drive)) {
 			printk(KERN_ERR "ide: failed to init %s\n",
 					drive->name);
+			kfree(drive->id);
+			drive->id = NULL;
+			drive->dev_flags &= ~IDE_DFLAG_PRESENT;
 			continue;
 		}
 
+		j++;
+
 		ide_add_drive_to_hwgroup(drive);
 	}
 	mutex_unlock(&ide_cfg_mtx);
+
+	return j;
 }
 
 static ide_hwif_t *ide_ports[MAX_HWIFS];
@@ -1663,10 +1670,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
 			continue;
 		}
 
-		j++;
-
 		if (hwif->present)
-			ide_port_setup_devices(hwif);
+			if (ide_port_setup_devices(hwif) == 0) {
+				hwif->present = 0;
+				continue;
+			}
+
+		j++;
 
 		ide_acpi_init(hwif);