Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[cascardo/linux.git] / sound / arm / pxa2xx-pcm-lib.c

diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 1c93eb7..108b643 100644 (file)
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -12,8 +12,7 @@
 #include <sound/pcm_params.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <asm/dma.h>
-#include <mach/pxa-regs.h>
+#include <mach/dma.h>
 
 #include "pxa2xx-pcm.h"
 
@@ -194,7 +193,7 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream)
                goto out;
 
        ret = -ENOMEM;
-       rtd = kmalloc(sizeof(*rtd), GFP_KERNEL);
+       rtd = kzalloc(sizeof(*rtd), GFP_KERNEL);
        if (!rtd)
                goto out;
        rtd->dma_desc_array =