From 825ad5d689c2ca17127f4ce373465dfa46ba9337 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 9 Jun 2005 16:53:28 +0100
Subject: [PATCH] --- yaml --- r: 1928 b: refs/heads/master c:
 4e71e47da3367e8df5994a17fb421ddeaa5025e3 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mm/minicache.c    | 0
 trunk/drivers/scsi/libata-core.c | 4 +++-
 trunk/drivers/scsi/sata_sil.c    | 8 +-------
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 trunk/arch/arm/mm/minicache.c

diff --git a/[refs] b/[refs]
index 6af99216f0f0..e650ec74f97b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6952df035509717bdc46194b2a3d6ffb9349f267
+refs/heads/master: 4e71e47da3367e8df5994a17fb421ddeaa5025e3
diff --git a/trunk/arch/arm/mm/minicache.c b/trunk/arch/arm/mm/minicache.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 9e58f134f68b..21d194c6ace3 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -2577,6 +2577,7 @@ 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;
 
@@ -2584,7 +2585,6 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
 	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,6 +2609,8 @@ 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;
 	}
 }
diff --git a/trunk/drivers/scsi/sata_sil.c b/trunk/drivers/scsi/sata_sil.c
index 49ed557a4b66..238580d244e6 100644
--- a/trunk/drivers/scsi/sata_sil.c
+++ b/trunk/drivers/scsi/sata_sil.c
@@ -432,13 +432,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 		writeb(cls, mmio_base + SIL_FIFO_R0);
 		writeb(cls, mmio_base + SIL_FIFO_W0);
 		writeb(cls, mmio_base + SIL_FIFO_R1);
-		writeb(cls, mmio_base + SIL_FIFO_W1);
-		if (ent->driver_data == sil_3114) {
-			writeb(cls, mmio_base + SIL_FIFO_R2);
-			writeb(cls, mmio_base + SIL_FIFO_W2);
-			writeb(cls, mmio_base + SIL_FIFO_R3);
-			writeb(cls, mmio_base + SIL_FIFO_W3);
-		}
+		writeb(cls, mmio_base + SIL_FIFO_W2);
 	} else
 		printk(KERN_WARNING DRV_NAME "(%s): cache line size not set.  Driver may not function\n",
 			pci_name(pdev));