lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into upstream

Browse Source
This commit is contained in:
Jeff Garzik
2006-09-19 00:42:13 -04:00
parent fea63e3801 47a5c6fa0e
commit 4a3381feb8
127 changed files with 2307 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/ata/libata-core.c
View File

@@ -1276,10 +1276,15 @@ 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";
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) {