Attachment #220 for bug #1046

View | Details | Raw Unified | Return to bug 1046
Collapse All | Expand All




		goto fail_release_iomem;

	/* set 64-bit DMA mask */
	err = dma_set_mask_and_coherent(&dev->dev,  DMA_BIT_MASK(64));
	if (err != 0) {
		dev_err(&dev->dev, "Cannot set DMA mask\n");
		goto fail_release_iomem;
	}

	err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
	if (err != 0) {
		dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
		goto fail_release_iomem;
	}

	/* fill uio infos */
	udev->info.name = "igb_uio";
	udev->info.version = "0.1";

Return to bug 1046

Lines 512-529 igbuio_pci_probe(struct pci_dev dev, const struct pci_device_id id) Link Here

(-)a/linux/igb_uio/igb_uio.c (-7 / +1 lines)
512	goto fail_release_iomem;	512	goto fail_release_iomem;
513		513
514	/* set 64-bit DMA mask */	514	/* set 64-bit DMA mask */
515	err = pci_set_dma_mask(dev, DMA_BIT_MASK(64));	515	err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64));
516	if (err != 0) {	516	if (err != 0) {
517	dev_err(&dev->dev, "Cannot set DMA mask\n");	517	dev_err(&dev->dev, "Cannot set DMA mask\n");
518	goto fail_release_iomem;	518	goto fail_release_iomem;
519	}	519	}
520		520
521	err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64));
522	if (err != 0) {
523	dev_err(&dev->dev, "Cannot set consistent DMA mask\n");
524	goto fail_release_iomem;
525	}
526
527	/* fill uio infos */	521	/* fill uio infos */
528	udev->info.name = "igb_uio";	522	udev->info.name = "igb_uio";
529	udev->info.version = "0.1";	523	udev->info.version = "0.1";