From 85e42b32412538dfa8ec29538a94c136bed28dd3 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Thu, 1 Nov 2012 18:28:36 +0300 Subject: [PATCH] --- yaml --- r: 344416 b: refs/heads/master c: 52bd4978c61bc23e619a4287a3d30814c97b5d4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_arasan_cf.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 69aff10110e2..3bc4be900b74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 121650a55535e4a3f152a30ee42f26e815eff714 +refs/heads/master: 52bd4978c61bc23e619a4287a3d30814c97b5d4e diff --git a/trunk/drivers/ata/pata_arasan_cf.c b/trunk/drivers/ata/pata_arasan_cf.c index 371fd2c698b7..9764e80f9320 100644 --- a/trunk/drivers/ata/pata_arasan_cf.c +++ b/trunk/drivers/ata/pata_arasan_cf.c @@ -674,13 +674,16 @@ void arasan_cf_error_handler(struct ata_port *ap) static void arasan_cf_dma_start(struct arasan_cf_dev *acdev) { + struct ata_queued_cmd *qc = acdev->qc; + struct ata_port *ap = qc->ap; + struct ata_taskfile *tf = &qc->tf; u32 xfer_ctr = readl(acdev->vbase + XFER_CTR) & ~XFER_DIR_MASK; - u32 write = acdev->qc->tf.flags & ATA_TFLAG_WRITE; + u32 write = tf->flags & ATA_TFLAG_WRITE; xfer_ctr |= write ? XFER_WRITE : XFER_READ; writel(xfer_ctr, acdev->vbase + XFER_CTR); - acdev->qc->ap->ops->sff_exec_command(acdev->qc->ap, &acdev->qc->tf); + ap->ops->sff_exec_command(ap, tf); ata_sff_queue_work(&acdev->work); }