From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 27 Feb 2006 16:49:05 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cccc65a3b60edaf721cdee5a14f68ba009341822;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master'
---

cccc65a3b60edaf721cdee5a14f68ba009341822
diff --cc drivers/scsi/sata_sil.c
index e14ed4ebbeed,9face3c6aa21..91ecf527bb8a
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@@ -198,7 -203,19 +202,19 @@@ static const struct ata_port_info sil_p
  	{
  		.sht		= &sil_sht,
  		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
- 				  ATA_FLAG_MMIO,
+ 				  ATA_FLAG_SRST | ATA_FLAG_MMIO |
+ 				  SIL_FLAG_RERR_ON_DMA_ACT,
+ 		.pio_mask	= 0x1f,			/* pio0-4 */
+ 		.mwdma_mask	= 0x07,			/* mwdma0-2 */
+ 		.udma_mask	= 0x3f,			/* udma0-5 */
+ 		.port_ops	= &sil_ops,
+ 	},
+ 	/* sil_3114 */
+ 	{
+ 		.sht		= &sil_sht,
+ 		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -				  ATA_FLAG_SRST | ATA_FLAG_MMIO |
++				  ATA_FLAG_MMIO |
+ 				  SIL_FLAG_RERR_ON_DMA_ACT,
  		.pio_mask	= 0x1f,			/* pio0-4 */
  		.mwdma_mask	= 0x07,			/* mwdma0-2 */
  		.udma_mask	= 0x3f,			/* udma0-5 */