summaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-05 09:26:41 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-05 09:26:41 +0200
commit6d74b86d3c0f9cfa949566a862aaad840e393249 (patch)
treec375d4eb75308e877111ea88b812edbc5d50aa44 /sound/pci/ctxfi
parentbd05dbd3b22612455283610b4e006ee3e421b13d (diff)
downloadblackbird-op-linux-6d74b86d3c0f9cfa949566a862aaad840e393249.tar.gz
blackbird-op-linux-6d74b86d3c0f9cfa949566a862aaad840e393249.zip
ALSA: ctxfi - Allow 64bit DMA
emu20kx chips support 64bit address PTE. Allow the DMA bit mask to accept 64bit address, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi')
-rw-r--r--sound/pci/ctxfi/cthw20k1.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index b7b8e6f41d0d..1da1f82fe812 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -15,8 +15,6 @@
*
*/
-#include "cthw20k1.h"
-#include "ct20k1reg.h"
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/pci.h>
@@ -26,8 +24,14 @@
#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
+#include "cthw20k1.h"
+#include "ct20k1reg.h"
-#define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bits */
+#if BITS_PER_LONG == 32
+#define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bit PTE */
+#else
+#define CT_XFI_DMA_MASK DMA_BIT_MASK(64) /* 64 bit PTE */
+#endif
struct hw20k1 {
struct hw hw;
OpenPOWER on IntegriCloud