---

yaml
---
r: 1927
b: refs/heads/master
c: 6952df0
h: refs/heads/master
i:
  1925: 1b61b98
  1923: 6d568f8
  1919: ad4556a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1dd23a0012c3929737798fda9fede0e783f4ff3
+refs/heads/master: 6952df035509717bdc46194b2a3d6ffb9349f267

trunk/drivers/scsi/libata-core.c

@@ -2577,14 +2577,14 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
 next_sg:
 	sg = &qc->sg[qc->cursg];
 
-next_page:
 	page = sg->page;
 	offset = sg->offset + qc->cursg_ofs;
 
 	/* get the current page and offset */
 	page = nth_page(page, (offset >> PAGE_SHIFT));
 	offset %= PAGE_SIZE;
 
+	/* don't overrun current sg */
 	count = min(sg->length - qc->cursg_ofs, bytes);
 
 	/* don't cross page boundaries */
@@ -2609,8 +2609,6 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
 	kunmap(page);
 
 	if (bytes) {
-		if (qc->cursg_ofs < sg->length)
-			goto next_page;
 		goto next_sg;
 	}
 }