[libata] allow ATAPI to be enabled with new atapi_enabled module option

ATAPI is getting close to being ready.  To increase exposure, we enable
the code in the upstream kernel, but default it to off (present
behavior).  Users must pass atapi_enabled=1 as a module option (if
module) or on the kernel command line (if built in) to turn on
discovery of their ATAPI devices.
This commit is contained in:
Jeff Garzik
2005-08-30 03:37:42 -04:00
parent 1fdab81e67
commit 1623c81eec
4 changed files with 9 additions and 5 deletions

View File

@@ -1470,10 +1470,10 @@ ata_scsi_find_dev(struct ata_port *ap, struct scsi_device *scsidev)
if (unlikely(!ata_dev_present(dev)))
return NULL;
#ifndef ATA_ENABLE_ATAPI
if (unlikely(dev->class == ATA_DEV_ATAPI))
return NULL;
#endif
if (atapi_enabled) {
if (unlikely(dev->class == ATA_DEV_ATAPI))
return NULL;
}
return dev;
}