Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index af526b671c4e..4ee597d08797 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -622,12 +622,18 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
         ide_hwif_t *hwif;
         int h;
 
+        /*
+         * Find an empty HWIF; if none available, return -ENOMEM.
+         */
         for (h = 0; h < MAX_HWIFS; ++h) {
                 hwif = &ide_hwifs[h];
-                /* Find an empty HWIF */
                 if (hwif->chipset == ide_unknown)
                         break;
         }
+        if (h == MAX_HWIFS) {
+                printk(KERN_ERR "%s: too many IDE interfaces, no room in table\n", d->name);
+                return -ENOMEM;
+        }
 
         /*  Get the CmdBlk and CtrlBlk Base Registers */
         base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET;