The patch titled libata: ignore CFA signature while sanity-checking an ATAPI device has been removed from the -mm tree. Its filename is redo-libata-ignore-cfa-signature-while-sanity-checking-an-atapi-device.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: libata: ignore CFA signature while sanity-checking an ATAPI device From: Tejun Heo <htejun@xxxxxxxxx> 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@xxxxxxxxx> Cc: J.A. Magallon <jamagallon@xxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ata/libata-core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff -puN drivers/ata/libata-core.c~redo-libata-ignore-cfa-signature-while-sanity-checking-an-atapi-device drivers/ata/libata-core.c --- a/drivers/ata/libata-core.c~redo-libata-ignore-cfa-signature-while-sanity-checking-an-atapi-device +++ a/drivers/ata/libata-core.c @@ -1276,10 +1276,15 @@ int ata_dev_read_id(struct ata_device *d 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"; - goto err_out; + 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; } if (post_reset && class == ATA_DEV_ATA) { _ Patches currently in -mm which might be from htejun@xxxxxxxxx are origin.patch git-libata-all.patch redo-libata-ignore-cfa-signature-while-sanity-checking-an-atapi-device.patch 1-of-2-jmicron-driver-fix.patch via-pata-controller-xfer-fixes.patch via-pata-controller-xfer-fixes-fix.patch via-sata-oops-on-init.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html