aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/sis5513.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/sis5513.c')
-rw-r--r--drivers/ide/pci/sis5513.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index ec0adad9ef61..4457c9d379f6 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -796,7 +796,7 @@ static unsigned int __devinit init_chipset_sis5513 (struct pci_dev *dev, const c
796 return 0; 796 return 0;
797} 797}
798 798
799static unsigned int __devinit ata66_sis5513 (ide_hwif_t *hwif) 799static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
800{ 800{
801 u8 ata66 = 0; 801 u8 ata66 = 0;
802 802
@@ -811,7 +811,8 @@ static unsigned int __devinit ata66_sis5513 (ide_hwif_t *hwif)
811 pci_read_config_byte(hwif->pci_dev, 0x48, &reg48h); 811 pci_read_config_byte(hwif->pci_dev, 0x48, &reg48h);
812 ata66 = (reg48h & mask) ? 0 : 1; 812 ata66 = (reg48h & mask) ? 0 : 1;
813 } 813 }
814 return ata66; 814
815 return ata66 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
815} 816}
816 817
817static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) 818static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
@@ -841,8 +842,8 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
841 if (!chipset_family) 842 if (!chipset_family)
842 return; 843 return;
843 844
844 if (!(hwif->udma_four)) 845 if (hwif->cbl != ATA_CBL_PATA40_SHORT)
845 hwif->udma_four = ata66_sis5513(hwif); 846 hwif->cbl = ata66_sis5513(hwif);
846 847
847 if (chipset_family > ATA_16) { 848 if (chipset_family > ATA_16) {
848 hwif->ide_dma_check = &sis5513_config_xfer_rate; 849 hwif->ide_dma_check = &sis5513_config_xfer_rate;