patch-2.1.80 linux/drivers/sound/soundcard.c

Next file: linux/fs/Config.in
Previous file: linux/drivers/sound/pas2_card.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.79/linux/drivers/sound/soundcard.c linux/drivers/sound/soundcard.c
@@ -12,7 +12,8 @@
  */
 /*
  * Thomas Sailer   : ioctl code reworked (vmalloc/vfree removed)
- *                   integrated sound_switch.c and made /proc/sound (equals to /dev/sndstat,
+ *                   integrated sound_switch.c
+ * Stefan Reinauer : integrated /proc/sound (equals to /dev/sndstat,
  *                   which should disappear in the near future)
  */
 #include <linux/config.h>
@@ -1100,7 +1101,8 @@
 
 		dmap->buffsize = PAGE_SIZE * (1 << sz);
 
-		if ((start_addr = (char *) __get_free_pages(GFP_ATOMIC, sz, MAX_DMA_ADDRESS)) == NULL)
+		start_addr = (char *) __get_free_pages(GFP_ATOMIC | GFP_DMA, sz);
+		if (start_addr == NULL)
 			dmap->buffsize /= 2;
 	}
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov