From 531caf94c51c10ed1b21187da9bd0d44a6973740 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Tue, 5 Feb 2008 14:06:27 +0900 Subject: [PATCH] --- yaml --- r: 83673 b: refs/heads/master c: 37198e3051b63d3184886e9bb8235e7578e82628 h: refs/heads/master i: 83671: c5b1dbdd56a6234892ef01a9ab1a48860c49d6aa v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_fsl.c | 4 ++-- trunk/include/linux/libata.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e2f89710d283..672aab72b2a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 837f5f8fb98d4357d49e9631c9ee2815f3c328ca +refs/heads/master: 37198e3051b63d3184886e9bb8235e7578e82628 diff --git a/trunk/drivers/ata/sata_fsl.c b/trunk/drivers/ata/sata_fsl.c index 922d7b2efba8..efcb66b6ccef 100644 --- a/trunk/drivers/ata/sata_fsl.c +++ b/trunk/drivers/ata/sata_fsl.c @@ -355,8 +355,8 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, ata_port_printk(qc->ap, KERN_ERR, "s/g len unaligned : 0x%x\n", sg_len); - if ((num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1)) && - (qc->n_iter + 1 != qc->n_elem)) { + if (num_prde == (SATA_FSL_MAX_PRD_DIRECT - 1) && + sg_next(sg) != NULL) { VPRINTK("setting indirect prde\n"); prd_ptr_to_indirect_ext = prd; prd->dba = cpu_to_le32(indirect_ext_segment_paddr); diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 4374c4277780..bc5a8d0c7090 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -457,7 +457,6 @@ struct ata_queued_cmd { unsigned long flags; /* ATA_QCFLAG_xxx */ unsigned int tag; unsigned int n_elem; - unsigned int n_iter; unsigned int mapped_n_elem; int dma_dir; @@ -1367,7 +1366,6 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc) qc->nbytes = qc->raw_nbytes = qc->curbytes = 0; qc->n_elem = 0; qc->mapped_n_elem = 0; - qc->n_iter = 0; qc->err_mask = 0; qc->pad_len = 0; qc->last_sg = NULL;