Skip to content

Commit bec8cb2

Browse files
committed
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()
2 parents 5b46fb0 + a66307d commit bec8cb2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/ata/ahci_ceva.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ struct ceva_ahci_priv {
9494
static unsigned int ceva_ahci_read_id(struct ata_device *dev,
9595
struct ata_taskfile *tf, u16 *id)
9696
{
97+
__le16 *__id = (__le16 *)id;
9798
u32 err_mask;
9899

99100
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,
103104
* Since CEVA controller does not support device sleep feature, we
104105
* need to clear DEVSLP (bit 8) in word78 of the IDENTIFY DEVICE data.
105106
*/
106-
id[ATA_ID_FEATURE_SUPP] &= cpu_to_le16(~(1 << 8));
107+
__id[ATA_ID_FEATURE_SUPP] &= cpu_to_le16(~(1 << 8));
107108

108109
return 0;
109110
}

drivers/ata/libata-core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3920,6 +3920,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
39203920
{ "VRFDFC22048UCHC-TE*", NULL, ATA_HORKAGE_NODMA },
39213921
/* Odd clown on sil3726/4726 PMPs */
39223922
{ "Config Disk", NULL, ATA_HORKAGE_DISABLE },
3923+
/* Similar story with ASMedia 1092 */
3924+
{ "ASMT109x- Config", NULL, ATA_HORKAGE_DISABLE },
39233925

39243926
/* Weird ATAPI devices */
39253927
{ "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 },

0 commit comments

Comments
 (0)