projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/misc' into topic/misc
[cascardo/linux.git]
/
sound
/
oss
/
soundcard.c
diff --git
a/sound/oss/soundcard.c
b/sound/oss/soundcard.c
index
7d89c08
..
fde7c12
100644
(file)
--- a/
sound/oss/soundcard.c
+++ b/
sound/oss/soundcard.c
@@
-56,7
+56,7
@@
/*
* Table for permanently allocated memory (used when unloading the module)
*/
/*
* Table for permanently allocated memory (used when unloading the module)
*/
-void * sound_mem_blocks[
1024
];
+void * sound_mem_blocks[
MAX_MEM_BLOCKS
];
int sound_nblocks = 0;
/* Persistent DMA buffers */
int sound_nblocks = 0;
/* Persistent DMA buffers */
@@
-328,11
+328,11
@@
static int sound_mixer_ioctl(int mixdev, unsigned int cmd, void __user *arg)
return mixer_devs[mixdev]->ioctl(mixdev, cmd, arg);
}
return mixer_devs[mixdev]->ioctl(mixdev, cmd, arg);
}
-static int sound_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int len = 0, dtype;
{
int len = 0, dtype;
- int dev = iminor(inode);
+ int dev = iminor(file->f_dentry->d_inode);
+ long ret = -EINVAL;
void __user *p = (void __user *)arg;
if (_SIOC_DIR(cmd) != _SIOC_NONE && _SIOC_DIR(cmd) != 0) {
void __user *p = (void __user *)arg;
if (_SIOC_DIR(cmd) != _SIOC_NONE && _SIOC_DIR(cmd) != 0) {
@@
-353,6
+353,7
@@
static int sound_ioctl(struct inode *inode, struct file *file,
if (cmd == OSS_GETVERSION)
return __put_user(SOUND_VERSION, (int __user *)p);
if (cmd == OSS_GETVERSION)
return __put_user(SOUND_VERSION, (int __user *)p);
+ lock_kernel();
if (_IOC_TYPE(cmd) == 'M' && num_mixers > 0 && /* Mixer ioctl */
(dev & 0x0f) != SND_DEV_CTL) {
dtype = dev & 0x0f;
if (_IOC_TYPE(cmd) == 'M' && num_mixers > 0 && /* Mixer ioctl */
(dev & 0x0f) != SND_DEV_CTL) {
dtype = dev & 0x0f;
@@
-360,24
+361,31
@@
static int sound_ioctl(struct inode *inode, struct file *file,
case SND_DEV_DSP:
case SND_DEV_DSP16:
case SND_DEV_AUDIO:
case SND_DEV_DSP:
case SND_DEV_DSP16:
case SND_DEV_AUDIO:
- ret
urn
sound_mixer_ioctl(audio_devs[dev >> 4]->mixer_dev,
+ ret
=
sound_mixer_ioctl(audio_devs[dev >> 4]->mixer_dev,
cmd, p);
cmd, p);
-
+ break;
default:
default:
- return sound_mixer_ioctl(dev >> 4, cmd, p);
+ ret = sound_mixer_ioctl(dev >> 4, cmd, p);
+ break;
}
}
+ unlock_kernel();
+ return ret;
}
}
+
switch (dev & 0x0f) {
case SND_DEV_CTL:
if (cmd == SOUND_MIXER_GETLEVELS)
switch (dev & 0x0f) {
case SND_DEV_CTL:
if (cmd == SOUND_MIXER_GETLEVELS)
- return get_mixer_levels(p);
- if (cmd == SOUND_MIXER_SETLEVELS)
- return set_mixer_levels(p);
- return sound_mixer_ioctl(dev >> 4, cmd, p);
+ ret = get_mixer_levels(p);
+ else if (cmd == SOUND_MIXER_SETLEVELS)
+ ret = set_mixer_levels(p);
+ else
+ ret = sound_mixer_ioctl(dev >> 4, cmd, p);
+ break;
case SND_DEV_SEQ:
case SND_DEV_SEQ2:
case SND_DEV_SEQ:
case SND_DEV_SEQ2:
- return sequencer_ioctl(dev, file, cmd, p);
+ ret = sequencer_ioctl(dev, file, cmd, p);
+ break;
case SND_DEV_DSP:
case SND_DEV_DSP16:
case SND_DEV_DSP:
case SND_DEV_DSP16:
@@
-390,7
+398,8
@@
static int sound_ioctl(struct inode *inode, struct file *file,
break;
}
break;
}
- return -EINVAL;
+ unlock_kernel();
+ return ret;
}
static unsigned int sound_poll(struct file *file, poll_table * wait)
}
static unsigned int sound_poll(struct file *file, poll_table * wait)
@@
-490,7
+499,7
@@
const struct file_operations oss_sound_fops = {
.read = sound_read,
.write = sound_write,
.poll = sound_poll,
.read = sound_read,
.write = sound_write,
.poll = sound_poll,
- .
ioctl
= sound_ioctl,
+ .
unlocked_ioctl
= sound_ioctl,
.mmap = sound_mmap,
.open = sound_open,
.release = sound_release,
.mmap = sound_mmap,
.open = sound_open,
.release = sound_release,
@@
-560,22
+569,21
@@
static int __init oss_init(void)
sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
- device_create
_drvdata
(sound_class, NULL,
-
MKDEV(SOUND_MAJOR, dev_list[i].minor)
,
-
NULL,
"%s", dev_list[i].name);
+ device_create(sound_class, NULL,
+
MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL
,
+ "%s", dev_list[i].name);
if (!dev_list[i].num)
continue;
for (j = 1; j < *dev_list[i].num; j++)
if (!dev_list[i].num)
continue;
for (j = 1; j < *dev_list[i].num; j++)
- device_create_drvdata(sound_class, NULL,
- MKDEV(SOUND_MAJOR,
- dev_list[i].minor + (j*0x10)),
- NULL,
- "%s%d", dev_list[i].name, j);
+ device_create(sound_class, NULL,
+ MKDEV(SOUND_MAJOR,
+ dev_list[i].minor + (j*0x10)),
+ NULL, "%s%d", dev_list[i].name, j);
}
}
- if (sound_nblocks >=
1024
)
+ if (sound_nblocks >=
MAX_MEM_BLOCKS - 1
)
printk(KERN_ERR "Sound warning: Deallocation table was too small.\n");
return 0;
printk(KERN_ERR "Sound warning: Deallocation table was too small.\n");
return 0;