ide: fix ide_find_port()

* Instead of checking for '->io_ports[IDE_DATA_OFFSET] == 0' check for
  '->chipset == ide_unknown' when looking for an empty ide_hwifs[] slot.

* Do ide-pnp initialization after ide-generic when IDE is built-in
  (ide-pnp is the only user of ide_find_port() which needs such fixup).

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index a4a4323be911b3761b1c6642c893576e3824c4d0..571544c37bb26a3fbc47bcf6a11e9fd2e376956a 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -36,9 +36,9 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y)
 endif
 
 obj-$(CONFIG_BLK_DEV_IDE)              += cris/ ppc/
-obj-$(CONFIG_BLK_DEV_IDEPNP)           += ide-pnp.o
 obj-$(CONFIG_IDE_H8300)                        += h8300/
 obj-$(CONFIG_IDE_GENERIC)              += ide-generic.o
+obj-$(CONFIG_BLK_DEV_IDEPNP)           += ide-pnp.o
 
 ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o
 

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 5f545153391a0712fcb35f189e462d5866bf5437..67ce697a9d51f98036ecb8e907788ee37bd18898 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -255,7 +255,7 @@ ide_hwif_t * ide_find_port(unsigned long base)
 
        for (i = 0; i < MAX_HWIFS; i++) {
                hwif = &ide_hwifs[i];
-               if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
+               if (hwif->chipset == ide_unknown)
                        goto found;
        }