Update of /cvsroot/alsa/alsa-kernel/core/ioctl32
In directory usw-pr-cvs1:/tmp/cvs-serv10512
Modified Files:
ioctl32.c ioctl32.h pcm32.c
Log Message:
Fixed compilation by David S. Miller
Index: ioctl32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/ioctl32.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ioctl32.c 12 Oct 2002 14:18:09 -0000 1.12
+++ ioctl32.c 15 Oct 2002 18:54:27 -0000 1.13
@@ -23,6 +23,7 @@
#include <linux/smp_lock.h>
#include <linux/init.h>
#include <linux/time.h>
+#include <linux/slab.h>
#include <linux/init.h>
#include <sound/core.h>
#include <sound/control.h>
@@ -287,13 +288,13 @@
data->id = data32->id;
data->indirect = data32->indirect;
if (data->indirect) /* FIXME: this is not correct for long arrays */
- data.value.integer.value_ptr =
(void*)TO_PTR(data32->value.integer.value_ptr);
+ data->value.integer.value_ptr =
+(void*)TO_PTR(data32->value.integer.value_ptr);
type = get_ctl_type(file, &data->id);
if (type < 0) {
err = type;
goto __end;
}
- if (! data.indirect) {
+ if (! data->indirect) {
switch (type) {
case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
case SNDRV_CTL_ELEM_TYPE_INTEGER:
@@ -328,7 +329,7 @@
if (err < 0)
goto __end;
/* restore info to 32bit */
- if (! data.indirect) {
+ if (! data->indirect) {
switch (type) {
case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
case SNDRV_CTL_ELEM_TYPE_INTEGER:
Index: ioctl32.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/ioctl32.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ioctl32.h 14 Oct 2002 22:28:27 -0000 1.10
+++ ioctl32.h 15 Oct 2002 18:54:27 -0000 1.11
@@ -86,8 +86,8 @@
struct sndrv_##type *data;\
mm_segment_t oldseg;\
int err;\
- data32 = kcalloc(sizeof(*data32), GFP_KERNEL); \
- data = kcalloc(sizeof(*data), GFP_KERNEL); \
+ data32 = kmalloc(sizeof(*data32), GFP_KERNEL); \
+ data = kmalloc(sizeof(*data), GFP_KERNEL); \
if (data32 == NULL || data == NULL) { \
err = -ENOMEM; \
goto __end; \
Index: pcm32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/pcm32.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pcm32.c 12 Oct 2002 15:35:37 -0000 1.10
+++ pcm32.c 15 Oct 2002 18:54:27 -0000 1.11
@@ -20,6 +20,7 @@
#include <sound/driver.h>
#include <linux/time.h>
+#include <linux/slab.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include "ioctl32.h"
@@ -230,7 +231,7 @@
snd_pcm_file_t *pcm_file;
snd_pcm_substream_t *substream;
struct sndrv_xfern32 data32, *srcptr = (struct sndrv_xfern32*)arg;
- void *bufs = NULL;
+ void **bufs = NULL;
int err = 0, ch, i;
u32 *bufptr;
mm_segment_t oldseg;
@@ -260,7 +261,7 @@
return -EFAULT;
__get_user(data32.bufs, &srcptr->bufs);
bufptr = (u32*)TO_PTR(data32.bufs);
- bufs = kmalloc(sizeof(void *) * 128, GFP_KERNEL)
+ bufs = kmalloc(sizeof(void *) * 128, GFP_KERNEL);
if (bufs == NULL)
return -ENOMEM;
for (i = 0; i < ch; i++) {
@@ -352,8 +353,8 @@
mm_segment_t oldseg;
int err;
- data32 = kcalloc(sizeof(*data32), GFP_KERNEL);
- data = kcalloc(sizeof(*data), GFP_KERNEL);
+ data32 = snd_kcalloc(sizeof(*data32), GFP_KERNEL);
+ data = snd_kcalloc(sizeof(*data), GFP_KERNEL);
if (data32 == NULL || data == NULL) {
err = -ENOMEM;
goto __end;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
