git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
sound
/
core
/
ioctl32
/
rawmidi32.c
diff --git
a/sound/core/ioctl32/rawmidi32.c
b/sound/core/ioctl32/rawmidi32.c
index
c1d8948
..
5ff2124
100644
(file)
--- a/
sound/core/ioctl32/rawmidi32.c
+++ b/
sound/core/ioctl32/rawmidi32.c
@@
-38,11
+38,9
@@
struct sndrv_rawmidi_params32 {
#define CVT_sndrv_rawmidi_params()\
{\
COPY(stream);\
#define CVT_sndrv_rawmidi_params()\
{\
COPY(stream);\
- COPY_CVT(buffer_size);\
- COPY_CVT(avail_min);\
- if (copy_in_user(((size_t __user *)&dst->avail_min + 1),\
- ((size_t __user *)&src->avail_min + 1), 4)) \
- return -EFAULT;\
+ COPY(buffer_size);\
+ COPY(avail_min);\
+ COPY(no_active_sensing);\
}
struct sndrv_rawmidi_status32 {
}
struct sndrv_rawmidi_status32 {
@@
-56,10
+54,10
@@
struct sndrv_rawmidi_status32 {
#define CVT_sndrv_rawmidi_status()\
{\
COPY(stream);\
#define CVT_sndrv_rawmidi_status()\
{\
COPY(stream);\
- COPY
_CVT
(tstamp.tv_sec);\
- COPY
_CVT
(tstamp.tv_nsec);\
- COPY
_CVT
(avail);\
- COPY
_CVT
(xruns);\
+ COPY(tstamp.tv_sec);\
+ COPY(tstamp.tv_nsec);\
+ COPY(avail);\
+ COPY(xruns);\
}
DEFINE_ALSA_IOCTL(rawmidi_params);
}
DEFINE_ALSA_IOCTL(rawmidi_params);