Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9d9e61a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

sgiioc4: add missing ->dma_base check 



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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7bda292d

drivers/ide/pci/sgiioc4.c

+10 −6
Original line number Diff line number Diff line
@@ -587,8 +587,6 @@ static void __devinit 
ide_init_sgiioc4(ide_hwif_t * hwif)

{

	hwif->mmio = 1;

	hwif->atapi_dma = 1;

	hwif->mwdma_mask = 0x04;

	hwif->pio_mask = 0x00;

	hwif->set_pio_mode = NULL; /* Sets timing for PIO mode */

	hwif->set_dma_mode = &sgiioc4_set_dma_mode;
@@ -602,6 +600,14 @@ ide_init_sgiioc4(ide_hwif_t * hwif) 
	hwif->quirkproc = NULL;

	hwif->busproc = NULL;



	hwif->INB = &sgiioc4_INB;



	if (hwif->dma_base == 0)

		return;



	hwif->atapi_dma = 1;

	hwif->mwdma_mask = 0x04;



	hwif->dma_setup = &sgiioc4_ide_dma_setup;

	hwif->dma_start = &sgiioc4_ide_dma_start;

	hwif->ide_dma_end = &sgiioc4_ide_dma_end;
@@ -613,8 +619,6 @@ ide_init_sgiioc4(ide_hwif_t * hwif) 
	hwif->dma_host_off = &sgiioc4_dma_host_off;

	hwif->dma_lost_irq = &sgiioc4_dma_lost_irq;

	hwif->dma_timeout = &ide_dma_timeout;



	hwif->INB = &sgiioc4_INB;

}



static int __devinit
@@ -684,8 +688,6 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) 
	/* Initializing chipset IRQ Registers */

	writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));



	ide_init_sgiioc4(hwif);



	hwif->autodma = 0;



	if (dma_base && ide_dma_sgiioc4(hwif, dma_base) == 0) {
@@ -695,6 +697,8 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) 
		printk(KERN_INFO "%s: %s Bus-Master DMA disabled\n",

				 hwif->name, DRV_NAME);



	ide_init_sgiioc4(hwif);



	if (probe_hwif_init(hwif))

		return -EIO;