ide: Two fixes regarding memory allocation

In function ide_devset_execute() we should use __GFP_WAIT rather than
GFP_KERNEL. Also, the allocation cannot possibly fail at that point.
More importantly, there is a potential memory leak in the device probing
code. The infrastructure seems rather complex and I hope I haven't messed
anything up by trying to fix this.

Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
[bart: remove superfluous ide_lock taking]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 16 insertions, 9 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index d0579f1abdd..e205f46c3c7 100644
--- a/drivers/ide/ide-io.c
+++ b/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/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index bce427ee08a..de8edd306c7 100644
--- a/drivers/ide/ide-probe.c
+++ b/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);