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

Commit 2baeaaa4 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents ef6f63a4 77783a78

drivers/net/skge.c

+15 −5
Original line number Diff line number Diff line
@@ -3243,13 +3243,23 @@ static int __devinit skge_probe(struct pci_dev *pdev, 


	pci_set_master(pdev);



	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)))

	if (sizeof(dma_addr_t) > sizeof(u32) &&

	    !(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {

		using_dac = 1;

	else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {

		err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);

		if (err < 0) {

			printk(KERN_ERR PFX "%s unable to obtain 64 bit DMA "

			       "for consistent allocations\n", pci_name(pdev));

			goto err_out_free_regions;

		}

	} else {

		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		if (err) {

			printk(KERN_ERR PFX "%s no usable DMA configuration\n",

			       pci_name(pdev));

			goto err_out_free_regions;

		}

	}



#ifdef __BIG_ENDIAN

	/* byte swap descriptors in hardware */