Skip to content

Commit

Permalink
cs5535: add missing ->dma_base check
Browse files Browse the repository at this point in the history
If ->dma_base is not set (== PCI BAR4 cannot be reserved) then DMA hooks
shouldn't be initialized or bad things will happen.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Oct 13, 2007
1 parent 76bb778 commit 7bda292
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/ide/pci/cs5535.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,16 @@ static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
*/
static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
{
int i;

hwif->autodma = 0;

hwif->set_pio_mode = &cs5535_set_pio_mode;
hwif->set_dma_mode = &cs5535_set_dma_mode;

hwif->drives[1].autotune = hwif->drives[0].autotune = 1;

if (hwif->dma_base == 0)
return;

hwif->ide_dma_check = &cs5535_dma_check;

hwif->atapi_dma = 1;
Expand All @@ -207,11 +211,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
if (!noautodma)
hwif->autodma = 1;

/* just setting autotune and not worrying about bios timings */
for (i = 0; i < 2; i++) {
hwif->drives[i].autotune = 1;
hwif->drives[i].autodma = hwif->autodma;
}
hwif->drives[1].autodma = hwif->drives[0].autodma = hwif->autodma;
}

static ide_pci_device_t cs5535_chipset __devinitdata = {
Expand Down

0 comments on commit 7bda292

Please sign in to comment.