Commit a4f5749b authored Sep 12, 2006 by Tejun Heo Committed by Linus Torvalds Sep 13, 2006

[PATCH] libata: ignore CFA signature while sanity-checking an ATAPI device



0x848a in ID word 0 indicates CFA device iff the ID data is obtained from
IDENTIFY DEVICE.  For ATAPI devices, 0x848a in ID work 0 indicates valid
ATAPI device.  Fix sanity check in ata_dev_read_id() such that ATAPI
devices reporting 0x848a in ID word 0 is not handled as error.

The problem is identified by J.A.  Magallon with HL-DT-ST DVDRAM GSA-4120B.

Signed-off-by: Tejun Helo <htejun@gmail.com>
Cc: J.A. Magallon <jamagallon@ono.com>
Acked-by: Jeff Garzik <jeff@garzik.org>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 95064a75

drivers/scsi/libata-core.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -1256,9 +1256,14 @@ int ata_dev_read_id(struct ata_device dev, unsigned int p_class,
		swap_buf_le16(id, ATA_ID_WORDS);

		/* sanity check */
		if ((class == ATA_DEV_ATA) != (ata_id_is_ata(id) \| ata_id_is_cfa(id))) {
		rc = -EINVAL;
		reason = "device reports illegal type";

		if (class == ATA_DEV_ATA) {
		if (!ata_id_is_ata(id) && !ata_id_is_cfa(id))
		goto err_out;
		} else {
		if (ata_id_is_ata(id))
		goto err_out;
		}