Commit bec8cb26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull libata fixes from Damien Le Moal:

 - Fix a sparse warning in the ahci_ceva driver (me)

 - Disable the ASMedia 1092 non-functional device (Hannes)

* tag 'libata-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  libata: add horkage for ASMedia 1092
  ata: ahci_ceva: Fix id array access in ceva_ahci_read_id()
parents 5b46fb03 a66307d4

drivers/ata/ahci_ceva.c

+2 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct ceva_ahci_priv { 
static unsigned int ceva_ahci_read_id(struct ata_device *dev,

					struct ata_taskfile *tf, u16 *id)

{

	__le16 *__id = (__le16 *)id;

	u32 err_mask;



	err_mask = ata_do_dev_read_id(dev, tf, id);
@@ -103,7 +104,7 @@ static unsigned int ceva_ahci_read_id(struct ata_device *dev, 
	 * Since CEVA controller does not support device sleep feature, we

	 * need to clear DEVSLP (bit 8) in word78 of the IDENTIFY DEVICE data.

	 */

	id[ATA_ID_FEATURE_SUPP] &= cpu_to_le16(~(1 << 8));

	__id[ATA_ID_FEATURE_SUPP] &= cpu_to_le16(~(1 << 8));



	return 0;

}

drivers/ata/libata-core.c

+2 −0
Original line number Diff line number Diff line
@@ -3920,6 +3920,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "VRFDFC22048UCHC-TE*", NULL,		ATA_HORKAGE_NODMA },

	/* Odd clown on sil3726/4726 PMPs */

	{ "Config  Disk",	NULL,		ATA_HORKAGE_DISABLE },

	/* Similar story with ASMedia 1092 */

	{ "ASMT109x- Config",	NULL,		ATA_HORKAGE_DISABLE },



	/* Weird ATAPI devices */

	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 },