[Hackndev-commit] SF.net SVN: hackndev: [624] linux4palm/linux/trunk

[<ma...@us...>]

Revision: 624
          http://svn.sourceforge.net/hackndev/?rev=624&view=rev
Author:   magon
Date:     2006-10-13 12:51:42 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
palmt3: Sound fixed, it is general ARM DMA alloc error and this is just work-around

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mm/consistent.c
    linux4palm/linux/trunk/drivers/soc/tsc2101.c
    linux4palm/linux/trunk/sound/core/pcm_native.c

Modified: linux4palm/linux/trunk/arch/arm/mm/consistent.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mm/consistent.c	2006-10-12 17:48:14 UTC (rev 623)
+++ linux4palm/linux/trunk/arch/arm/mm/consistent.c	2006-10-13 19:51:42 UTC (rev 624)
@@ -257,7 +257,8 @@
 		pte = consistent_pte[idx] + off;
 		c->vm_pages = page;
 
-		split_page(page, order);
+		if(!PageCompound(page))
+			split_page(page, order);
 
 		/*
 		 * Set the "dma handle"

Modified: linux4palm/linux/trunk/drivers/soc/tsc2101.c
===================================================================
--- linux4palm/linux/trunk/drivers/soc/tsc2101.c	2006-10-12 17:48:14 UTC (rev 623)
+++ linux4palm/linux/trunk/drivers/soc/tsc2101.c	2006-10-13 19:51:42 UTC (rev 624)
@@ -858,8 +858,7 @@
 	int ret;
 	ret = driver_register(&tsc2101_driver);
 	/* Sound driver */
-	printk(KERN_ERR "!! SOUND CODE DISABLED !! FIXME !!\n");
-	/* snd_pxa2xx_i2sound_card_activate(&tsc2101_audio); */
+	snd_pxa2xx_i2sound_card_activate(&tsc2101_audio);
 	return ret;
 }
 

Modified: linux4palm/linux/trunk/sound/core/pcm_native.c
===================================================================
--- linux4palm/linux/trunk/sound/core/pcm_native.c	2006-10-12 17:48:14 UTC (rev 623)
+++ linux4palm/linux/trunk/sound/core/pcm_native.c	2006-10-13 19:51:42 UTC (rev 624)
@@ -3110,7 +3110,7 @@
 			return NOPAGE_OOM;
 	} else {
 		vaddr = runtime->dma_area + offset;
-		page = virt_to_page(vaddr);
+		page = vmalloc_to_page(vaddr);
 	}
 	get_page(page);
 	if (type)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.