diff options
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 053c75263918..f1c57f72bbdb 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -77,8 +77,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
77 | int bus_speed = ide_pci_clk ? ide_pci_clk : 33; | 77 | int bus_speed = ide_pci_clk ? ide_pci_clk : 33; |
78 | int port = hwif->channel ? 0x5c : 0x58; | 78 | int port = hwif->channel ? 0x5c : 0x58; |
79 | int portFIFO = hwif->channel ? 0x55 : 0x54; | 79 | int portFIFO = hwif->channel ? 0x55 : 0x54; |
80 | u8 cd_dma_fifo = 0; | 80 | u8 cd_dma_fifo = 0, unit = drive->dn & 1; |
81 | int unit = drive->select.b.unit & 1; | ||
82 | 81 | ||
83 | if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8) | 82 | if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8) |
84 | s_clc = 0; | 83 | s_clc = 0; |
@@ -112,7 +111,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
112 | } | 111 | } |
113 | 112 | ||
114 | pci_write_config_byte(dev, port, s_clc); | 113 | pci_write_config_byte(dev, port, s_clc); |
115 | pci_write_config_byte(dev, port+drive->select.b.unit+2, (a_clc << 4) | r_clc); | 114 | pci_write_config_byte(dev, port + unit + 2, (a_clc << 4) | r_clc); |
116 | local_irq_restore(flags); | 115 | local_irq_restore(flags); |
117 | } | 116 | } |
118 | 117 | ||
@@ -154,7 +153,7 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
154 | ide_hwif_t *hwif = HWIF(drive); | 153 | ide_hwif_t *hwif = HWIF(drive); |
155 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 154 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
156 | u8 speed1 = speed; | 155 | u8 speed1 = speed; |
157 | u8 unit = (drive->select.b.unit & 0x01); | 156 | u8 unit = drive->dn & 1; |
158 | u8 tmpbyte = 0x00; | 157 | u8 tmpbyte = 0x00; |
159 | int m5229_udma = (hwif->channel) ? 0x57 : 0x56; | 158 | int m5229_udma = (hwif->channel) ? 0x57 : 0x56; |
160 | 159 | ||