summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-03-27 18:49:19 +0100
committerJeff Garzik <jeff@garzik.org>2006-03-29 19:30:28 -0500
commit692785e798f341c057ff976c35a3d86ad5af8ac6 (patch)
treec1bb3f9cfc1baa7702e8bc32c72141516598511b /drivers
parente35a9e01f2a504871e70576a9e11dbe4d8dee456 (diff)
downloadkernel-crypto-692785e798f341c057ff976c35a3d86ad5af8ac6.tar.gz
kernel-crypto-692785e798f341c057ff976c35a3d86ad5af8ac6.tar.xz
kernel-crypto-692785e798f341c057ff976c35a3d86ad5af8ac6.zip
[PATCH] libata - ATA is both ATA and CFA
I think this is still needed with the new probe code (which btw seems to be missing docs in upstream ?). Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libata-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 10933cb722e..41659448a20 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1140,7 +1140,7 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,
swap_buf_le16(id, ATA_ID_WORDS);
/* sanity check */
- if ((class == ATA_DEV_ATA) != ata_id_is_ata(id)) {
+ if ((class == ATA_DEV_ATA) != (ata_id_is_ata(id) | ata_id_is_cfa(id))) {
rc = -EINVAL;
reason = "device reports illegal type";
goto err_out;