diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:21 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:21 +0200 |
| commit | 2625cd52b6eafb63b72f2e53f933f41ba9e34dff (patch) | |
| tree | 1d104d623465a7c566dfa886ef1a77d43bb17970 | |
| parent | ce9b248bb451134fcb41e189e83e3838fb57caf0 (diff) | |
| download | op-kernel-dev-2625cd52b6eafb63b72f2e53f933f41ba9e34dff.zip op-kernel-dev-2625cd52b6eafb63b72f2e53f933f41ba9e34dff.tar.gz | |
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>
| -rw-r--r-- | drivers/ide/Makefile | 2 | ||||
| -rw-r--r-- | drivers/ide/ide.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index a4a4323b..571544c 100644 --- 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 5f54515..67ce697 100644 --- 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; } |
