diff options
| -rw-r--r-- | drivers/ata/libata-core.c | 6 | ||||
| -rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 23763a1ec570..d31ee557b395 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -1973,6 +1973,12 @@ retry: | |||
| 1973 | if (class == ATA_DEV_ATA) { | 1973 | if (class == ATA_DEV_ATA) { |
| 1974 | if (!ata_id_is_ata(id) && !ata_id_is_cfa(id)) | 1974 | if (!ata_id_is_ata(id) && !ata_id_is_cfa(id)) |
| 1975 | goto err_out; | 1975 | goto err_out; |
| 1976 | if (ap->host->flags & ATA_HOST_IGNORE_ATA && | ||
| 1977 | ata_id_is_ata(id)) { | ||
| 1978 | ata_dev_dbg(dev, | ||
| 1979 | "host indicates ignore ATA devices, ignored\n"); | ||
| 1980 | return -ENOENT; | ||
| 1981 | } | ||
| 1976 | } else { | 1982 | } else { |
| 1977 | if (ata_id_is_ata(id)) | 1983 | if (ata_id_is_ata(id)) |
| 1978 | goto err_out; | 1984 | goto err_out; |
diff --git a/include/linux/libata.h b/include/linux/libata.h index e926df7b54c9..6e887c742a27 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -247,6 +247,7 @@ enum { | |||
| 247 | ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ | 247 | ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ |
| 248 | ATA_HOST_STARTED = (1 << 1), /* Host started */ | 248 | ATA_HOST_STARTED = (1 << 1), /* Host started */ |
| 249 | ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */ | 249 | ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */ |
| 250 | ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */ | ||
| 250 | 251 | ||
| 251 | /* bits 24:31 of host->flags are reserved for LLD specific flags */ | 252 | /* bits 24:31 of host->flags are reserved for LLD specific flags */ |
| 252 | 253 | ||
