Merge /spare/repo/linux-2.6/

3 files changed, 9 insertions, 5 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1811cb240315..27fec8a5eb5b 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1752,7 +1752,7 @@ config SCSI_NCR53C7xx_FAST
 
 config SUN3_SCSI
         tristate "Sun3 NCR5380 SCSI"
-        depends on SUN3 && SCSI
+        depends on SUN3 && SCSI && BROKEN
         help
           This option will enable support for the OBIO (onboard io) NCR5380
           SCSI controller found in the Sun 3/50 and 3/60, as well as for
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 84c4770e5bb4..36b401fee1f1 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2607,7 +2607,6 @@ 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;
 
@@ -2615,6 +2614,7 @@ next_page:
         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 */
@@ -2639,8 +2639,6 @@ next_page:
         kunmap(page);
 
         if (bytes) {
-                if (qc->cursg_ofs < sg->length)
-                        goto next_page;
                 goto next_sg;
         }
 }
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 238580d244e6..49ed557a4b66 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -432,7 +432,13 @@ 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_W2);
+                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);
+                }
         } else
                 printk(KERN_WARNING DRV_NAME "(%s): cache line size not set.  Driver may not function\n",
                         pci_name(pdev));