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

Commit 77783a78 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] skge: fix dma mask setup. 



There are a couple of problems in the DMA setup code for skge.
* In the 64 bit case, it doesn't set the consistent mask.
* In the 32 bit case, the error check is backwards!
It likely will only be visible as a bug on 64 bit platforms.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 22d4d771

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 */