1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index b0619278454..26ebffc10f3 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -796,16 +796,19 @@ static inline void sil24_fill_sg(struct ata_queued_cmd *qc,
                                  struct sil24_sge *sge)
 {
         struct scatterlist *sg;
+        struct sil24_sge *last_sge = NULL;
 
         ata_for_each_sg(sg, qc) {
                 sge->addr = cpu_to_le64(sg_dma_address(sg));
                 sge->cnt = cpu_to_le32(sg_dma_len(sg));
-                if (ata_sg_is_last(sg, qc))
-                        sge->flags = cpu_to_le32(SGE_TRM);
-                else
-                        sge->flags = 0;
+                sge->flags = 0;
+
+                last_sge = sge;
                 sge++;
         }
+
+        if (likely(last_sge))
+                last_sge->flags = cpu_to_le32(SGE_TRM);
 }
 
 static int sil24_qc_defer(struct ata_queued_cmd *qc)