diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:36 -0400 |
commit | 52f3a771feafe3e9c56f8d00c8eb53fd8f578f2d (patch) | |
tree | d8175c70f54c525c2b106f3a21cff90e6e9e8d7d /drivers/ide/ide-probe.c | |
parent | d0b53f6866fa185da94968e62ae97923db18298c (diff) |
ide: fix for EATA SCSI HBA in ATA emulating mode
IDE probing code used to skip devices attached to EATA SCSI HBA
in ATA emulating mode but because of warm-plug support port I/O
resources are no longer freed if no devices are detected on a port
and the decision about the driver to use is left up to the user.
Remove no longer valid EATA SCSI HBA quirk from do_identify().
Noticed-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index f0c162488ec4..d227fe425d2f 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -134,18 +134,6 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd) | |||
134 | #endif | 134 | #endif |
135 | ide_fix_driveid(id); | 135 | ide_fix_driveid(id); |
136 | 136 | ||
137 | #if defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA) | ||
138 | /* | ||
139 | * EATA SCSI controllers do a hardware ATA emulation: | ||
140 | * Ignore them if there is a driver for them available. | ||
141 | */ | ||
142 | if ((id->model[0] == 'P' && id->model[1] == 'M') || | ||
143 | (id->model[0] == 'S' && id->model[1] == 'K')) { | ||
144 | printk("%s: EATA SCSI HBA %.10s\n", drive->name, id->model); | ||
145 | goto err_misc; | ||
146 | } | ||
147 | #endif /* CONFIG_SCSI_EATA || CONFIG_SCSI_EATA_PIO */ | ||
148 | |||
149 | /* | 137 | /* |
150 | * WIN_IDENTIFY returns little-endian info, | 138 | * WIN_IDENTIFY returns little-endian info, |
151 | * WIN_PIDENTIFY *usually* returns little-endian info. | 139 | * WIN_PIDENTIFY *usually* returns little-endian info. |