aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-13 11:47:52 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-13 11:47:52 -0400
commitdfb2311226539e0496c0a7c65ceebaaff2120a0b (patch)
treeb4db3281be713728a8e35be9c492c6d24803bac8 /drivers
parentb9d9e61abb85ecf4e4aa55328b21eac17840a3fb (diff)
cs5520: fix ->dma_base equal zero handling
Set hwif->ide_dma_{check,on} and hwif->autodma to 1 after checking that ->dma_base exists. If ->dma_base is not set (== PCI BAR4 cannot be reserved) then DMA hooks shouldn't be initialized or bad things will happen. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/pci/cs5520.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index cb2a10203dc4..fbce90048aec 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -142,25 +142,24 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
142{ 142{
143 hwif->set_pio_mode = &cs5520_set_pio_mode; 143 hwif->set_pio_mode = &cs5520_set_pio_mode;
144 hwif->set_dma_mode = &cs5520_set_dma_mode; 144 hwif->set_dma_mode = &cs5520_set_dma_mode;
145 hwif->ide_dma_check = &cs5520_config_drive_xfer_rate;
146 hwif->ide_dma_on = &cs5520_dma_on;
147 145
148 if(!noautodma) 146 if (hwif->dma_base == 0) {
149 hwif->autodma = 1; 147 hwif->drives[1].autotune = hwif->drives[0].autotune = 1;
150
151 if(!hwif->dma_base)
152 {
153 hwif->drives[0].autotune = 1;
154 hwif->drives[1].autotune = 1;
155 return; 148 return;
156 } 149 }
157 150
151 hwif->ide_dma_check = &cs5520_config_drive_xfer_rate;
152 hwif->ide_dma_on = &cs5520_dma_on;
153
158 /* ATAPI is harder so leave it for now */ 154 /* ATAPI is harder so leave it for now */
159 hwif->atapi_dma = 0; 155 hwif->atapi_dma = 0;
160 hwif->ultra_mask = 0; 156 hwif->ultra_mask = 0;
161 hwif->swdma_mask = 0; 157 hwif->swdma_mask = 0;
162 hwif->mwdma_mask = 0; 158 hwif->mwdma_mask = 0;
163 159
160 if (!noautodma)
161 hwif->autodma = 1;
162
164 hwif->drives[0].autodma = hwif->autodma; 163 hwif->drives[0].autodma = hwif->autodma;
165 hwif->drives[1].autodma = hwif->autodma; 164 hwif->drives[1].autodma = hwif->autodma;
166} 165}