1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 2b2ff48be396..49ed557a4b66 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -161,6 +161,7 @@ static struct ata_port_operations sil_ops = {
         .scr_write              = sil_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 
 static struct ata_port_info sil_port_info[] = {
@@ -431,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));