linux/debian/patches/features/all/mantis/0112-V4L-DVB-13808b-mantis-...

36 lines
1.3 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From 02a15cfbd0f3999572dffde165154b6e8c480ea8 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 17 Dec 2009 00:06:04 -0200
Subject: [PATCH 112/120] V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
drivers/media/dvb/mantis/mantis_pci.c: In function mantis_pci_init:
drivers/media/dvb/mantis/mantis_pci.c:76: warning: DMA_nnBIT_MASK is deprecated
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
(cherry picked from commit 184ac7535ee078a4572b668a348134d67c3977d2)
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
drivers/media/dvb/mantis/mantis_pci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c
index 5e4f576..e7cd8aa 100644
--- a/drivers/media/dvb/mantis/mantis_pci.c
+++ b/drivers/media/dvb/mantis/mantis_pci.c
@@ -73,7 +73,7 @@ int __devinit mantis_pci_init(struct mantis_pci *mantis)
goto fail0;
}
- err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+ err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
if (err != 0) {
dprintk(MANTIS_ERROR, 1, "ERROR: Unable to obtain 32 bit DMA <%i>", err);
ret = -ENOMEM;
--
1.7.1