lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-06-27 14:53:48 -07:00
parent 3e0777b8fa 3e90928d81
commit 3bd19078c2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/block/sx8.c
View File

@@ -26,6 +26,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/dma-mapping.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <asm/uaccess.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; goto err_out;
#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ #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) { if (!rc) {
rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
if (rc) { if (rc) {
printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
pci_name(pdev)); 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; pci_dac = 1;
} else { } else {
#endif #endif
rc = pci_set_dma_mask(pdev, 0xffffffffULL); rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) { if (rc) {
printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
pci_name(pdev)); pci_name(pdev));

5
sound/oss/via82cxxx_audio.c
View File

@@ -35,6 +35,7 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.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) if (rc)
goto err_out_disable; goto err_out_disable;
rc = pci_set_dma_mask(pdev, 0xffffffffULL); rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) if (rc)
goto err_out_res; goto err_out_res;
rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL); rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) if (rc)
goto err_out_res; goto err_out_res;