summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Lord <kernel@teksavvy.com>2010-08-20 16:13:16 +0200
committerJeff Garzik <jgarzik@redhat.com>2010-08-26 01:24:16 +0200
commit55ee67f837882f28a900705a2ca1af257ab6c53d (patch)
tree91393e3155968c1654bfdf89fdbe404afd736554
parentsata_mv: fix broken DSM/TRIM support (v2) (diff)
downloadlinux-55ee67f837882f28a900705a2ca1af257ab6c53d.tar.xz
linux-55ee67f837882f28a900705a2ca1af257ab6c53d.zip
libata-sff: remove harmful BUG_ON from ata_bmdma_qc_issue
Remove harmful BUG_ON() from ata_bmdma_qc_issue(), as it casts too wide of a net and breaks sata_mv. It also crashes the kernel while doing the BUG_ON(). There's already a WARN_ON_ONCE() further down to catch the case of POLLING for a BMDMA operation. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Cc: stable@kernel.org
-rw-r--r--drivers/ata/libata-sff.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 674c1436491f..3b82d8ef76f0 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2735,10 +2735,6 @@ unsigned int ata_bmdma_qc_issue(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
- /* see ata_dma_blacklisted() */
- BUG_ON((ap->flags & ATA_FLAG_PIO_POLLING) &&
- qc->tf.protocol == ATAPI_PROT_DMA);
-
/* defer PIO handling to sff_qc_issue */
if (!ata_is_dma(qc->tf.protocol))
return ata_sff_qc_issue(qc);