Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (29 commits)
  ide-tape: bump minor driver version
  ide-tape: cleanup the remaining codestyle issues
  ide-tape: fix syntax error in idetape_identify_device()
  ide-tape: remove leftover OnStream support warning
  ide-tape: collect module-related macro calls at the end
  ide-tape: include proper headers
  ide-tape: remove unused "length" arg from idetape_create_read_buffer_cmd()
  ide-tape: remove struct idetape_id_gcw
  ide-tape: cleanup and fix comments
  ide-tape: shorten some function names
  ide-tape: remove idetape_increase_max_pipeline_stages()
  ide-tape: struct idetape_tape_t: shorten member names v2
  ide-tape: struct idetape_tape_t: remove unused members
  ide-tape: remove typedef idetape_chrdev_direction_t
  ide-tape: simplify code branching in the interrupt handler
  ide-tape: remove unreachable code chunk
  ide-tape: remove struct idetape_read_position_result_t
  ide-tape: refactor the debug logging facility
  ide: add ide_read_error() inline helper
  ide: add ide_read_[alt]status() inline helpers
  ...

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index be469dbbe8fb..709b9e4d2871 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -20,8 +20,14 @@ static int __init ide_generic_init(void)
         if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
                 ide_get_lock(NULL, NULL); /* for atari only */
 
-        for (i = 0; i < MAX_HWIFS; i++)
-                idx[i] = ide_hwifs[i].present ? 0xff : i;
+        for (i = 0; i < MAX_HWIFS; i++) {
+                ide_hwif_t *hwif = &ide_hwifs[i];
+
+                if (hwif->io_ports[IDE_DATA_OFFSET] && !hwif->present)
+                        idx[i] = i;
+                else
+                        idx[i] = 0xff;
+        }
 
         ide_device_add_all(idx, NULL);