ide-generic: use ide_find_port() (take 3)
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Apr 2008 15:36:36 +0000 (17:36 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Apr 2008 15:36:36 +0000 (17:36 +0200)
There should be no functional changes caused by this patch.

v2:
* Fix comment (noticed by Sergei Shtylyov).

v3:
* Fix no initalization of idx in some case. (Johann Felix Soden)

Cc: Johann Felix Soden <johfel@users.sourceforge.net>
Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-generic.c

index f3ec02ed4492a22b53df0636df76b60bc9aa9700..19f63e393d18766f0511f9f04ea178f0f57ab3c9 100644 (file)
@@ -90,11 +90,21 @@ static int __init ide_generic_init(void)
        int i;
 
        for (i = 0; i < MAX_HWIFS; i++) {
-               ide_hwif_t *hwif = &ide_hwifs[i];
+               ide_hwif_t *hwif;
                unsigned long io_addr = ide_default_io_base(i);
                hw_regs_t hw;
 
-               if (hwif->chipset == ide_unknown && io_addr) {
+               if (io_addr) {
+                       /*
+                        * Skip probing if the corresponding
+                        * slot is already occupied.
+                        */
+                       hwif = ide_find_port();
+                       if (hwif == NULL || hwif->index != i) {
+                               idx[i] = 0xff;
+                               continue;
+                       }
+
                        memset(&hw, 0, sizeof(hw));
                        ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
                        hw.irq = ide_default_irq(io_addr);