2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 922d7b2efba8..efcb66b6ccef 100644
--- a/drivers/ata/sata_fsl.c
+++ b/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/include/linux/libata.h b/include/linux/libata.h
index 4374c4277780..bc5a8d0c7090 100644
--- a/include/linux/libata.h
+++ b/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;