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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
core
/
hwdep_compat.c
diff --git
a/sound/core/hwdep_compat.c
b/sound/core/hwdep_compat.c
index
6866f42
..
3827c0c
100644
(file)
--- a/
sound/core/hwdep_compat.c
+++ b/
sound/core/hwdep_compat.c
@@
-22,7
+22,7
@@
#include <linux/compat.h>
#include <linux/compat.h>
-struct snd
rv
_hwdep_dsp_image32 {
+struct snd_hwdep_dsp_image32 {
u32 index;
unsigned char name[64];
u32 image; /* pointer */
u32 index;
unsigned char name[64];
u32 image; /* pointer */
@@
-30,10
+30,10
@@
struct sndrv_hwdep_dsp_image32 {
u32 driver_data;
} /* don't set packed attribute here */;
u32 driver_data;
} /* don't set packed attribute here */;
-static int snd_hwdep_dsp_load_compat(s
nd_hwdep_t
*hw,
- struct snd
rv
_hwdep_dsp_image32 __user *src)
+static int snd_hwdep_dsp_load_compat(s
truct snd_hwdep
*hw,
+ struct snd_hwdep_dsp_image32 __user *src)
{
{
- struct snd
rv_hwdep_dsp_image
*dst;
+ struct snd
_hwdep_dsp_image __user
*dst;
compat_caddr_t ptr;
u32 val;
compat_caddr_t ptr;
u32 val;
@@
-56,12
+56,13
@@
static int snd_hwdep_dsp_load_compat(snd_hwdep_t *hw,
}
enum {
}
enum {
- SNDRV_HWDEP_IOCTL_DSP_LOAD32 = _IOW('H', 0x03, struct snd
rv
_hwdep_dsp_image32)
+ SNDRV_HWDEP_IOCTL_DSP_LOAD32 = _IOW('H', 0x03, struct snd_hwdep_dsp_image32)
};
};
-static long snd_hwdep_ioctl_compat(struct file * file, unsigned int cmd, unsigned long arg)
+static long snd_hwdep_ioctl_compat(struct file * file, unsigned int cmd,
+ unsigned long arg)
{
{
- s
nd_hwdep_t
*hw = file->private_data;
+ s
truct snd_hwdep
*hw = file->private_data;
void __user *argp = compat_ptr(arg);
switch (cmd) {
case SNDRV_HWDEP_IOCTL_PVERSION:
void __user *argp = compat_ptr(arg);
switch (cmd) {
case SNDRV_HWDEP_IOCTL_PVERSION: