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

Commit 3bd19078 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6

parents 3e0777b8 3e90928d

drivers/block/sx8.c

+4 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/delay.h>

#include <linux/time.h>

#include <linux/hdreg.h>

#include <linux/dma-mapping.h>

#include <asm/io.h>

#include <asm/semaphore.h>

#include <asm/uaccess.h>
@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out;



#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */

	rc = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);

	rc = pci_set_dma_mask(pdev, DMA_64BIT_MASK);

	if (!rc) {

		rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);

		rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",

				pci_name(pdev));
@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
		pci_dac = 1;

	} else {

#endif

		rc = pci_set_dma_mask(pdev, 0xffffffffULL);

		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",

				pci_name(pdev));

sound/oss/via82cxxx_audio.c

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/smp_lock.h>

#include <linux/ioport.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <asm/io.h>

#include <asm/uaccess.h>

#include <asm/semaphore.h>
@@ -3391,10 +3392,10 @@ static int __devinit via_init_one (struct pci_dev *pdev, const struct pci_device 
	if (rc)

		goto err_out_disable;



	rc = pci_set_dma_mask(pdev, 0xffffffffULL);

	rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

	if (rc)

		goto err_out_res;

	rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);

	rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

	if (rc)

		goto err_out_res;