summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-01-09 17:48:20 -0500
committerAK <andi@firstfloor.org>2011-03-31 11:57:53 -0700
commit41922ad4ddb29e0dff33a645d4d697895acb14ce (patch)
tree369f74bcf284ea942a4ee62dd2b42e55fd66ae67 /drivers/ata
parent863591babfdd78d107f54d0b3cff1c55841f902b (diff)
downloadlinux-stable-41922ad4ddb29e0dff33a645d4d697895acb14ce.tar.gz
linux-stable-41922ad4ddb29e0dff33a645d4d697895acb14ce.tar.bz2
linux-stable-41922ad4ddb29e0dff33a645d4d697895acb14ce.zip
pata_mpc52xx: inherit from ata_bmdma_port_ops
commit 77c5fd19075d299fe820bb59bb21b0b113676e20 upstream. pata_mpc52xx supports BMDMA but inherits ata_sff_port_ops which triggers BUG_ON() when a DMA command is issued. Fix it. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> Reported-by: Roman Fietze <roman.fietze@telemotive.de> Cc: Sergei Shtylyov <sshtylyov@mvista.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_mpc52xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index f087ab55b1df..8f56ef69f4db 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -610,7 +610,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
};
static struct ata_port_operations mpc52xx_ata_port_ops = {
- .inherits = &ata_sff_port_ops,
+ .inherits = &ata_bmdma_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
.set_dmamode = mpc52xx_ata_set_dmamode,