From 1c21a2c6018114b6f9963129ea43e9b3763c45ab Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 27 Jun 2007 02:49:38 +0900 Subject: [PATCH] --- yaml --- r: 58067 b: refs/heads/master c: 40a1d531f6c894b298e784fd2090d87633e4989a h: refs/heads/master i: 58065: a4f7c4028e6e7c28c799a03f66dc402578400d54 58063: 0d6607f08941880036aa6f32ebfe0d0b439107ce v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 7 +------ trunk/include/linux/libata.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c9d380930b3a..2c722e757cb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9a4197e266a40d5d1d16c9fb2a852cf10743afe +refs/heads/master: 40a1d531f6c894b298e784fd2090d87633e4989a diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 094b51891dbf..bfc59a104728 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -2046,10 +2046,6 @@ int ata_dev_configure(struct ata_device *dev) dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_128, dev->max_sectors); - /* limit ATAPI DMA to R/W commands only */ - if (ata_device_blacklisted(dev) & ATA_HORKAGE_DMA_RW_ONLY) - dev->horkage |= ATA_HORKAGE_DMA_RW_ONLY; - if (ap->ops->dev_config) ap->ops->dev_config(dev); @@ -3780,8 +3776,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "IOMEGA ZIP 250 ATAPI", NULL, ATA_HORKAGE_NODMA }, /* temporary fix */ /* Weird ATAPI devices */ - { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 | - ATA_HORKAGE_DMA_RW_ONLY }, + { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 }, /* Devices we expect to fail diagnostics */ diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index a3380f808630..620da7be07b7 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -298,7 +298,6 @@ enum { ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ - ATA_HORKAGE_DMA_RW_ONLY = (1 << 4), /* ATAPI DMA for RW only */ }; enum hsm_task_states {