android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] const file_operations fallout

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-03-14 09:04:31 +00:00 committed by Linus Torvalds
parent abf0437b42
commit d8b3966e4c
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/oss/dmasound/dmasound_core.c
View File

@ -1346,22 +1346,34 @@ static const struct file_operations sq_fops =
.ioctl = sq_ioctl, .ioctl = sq_ioctl,
.open = sq_open, .open = sq_open,
.release = sq_release, .release = sq_release,
#ifdef HAS_RECORD
.read = NULL /* default to no read for compat mode */
#endif
}; };
#ifdef HAS_RECORD
static const struct file_operations sq_fops_record =
{
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = sq_write,
.poll = sq_poll,
.ioctl = sq_ioctl,
.open = sq_open,
.release = sq_release,
.read = sq_read,
};
#endif
static int sq_init(void) static int sq_init(void)
{ {
const struct file_operations *fops = &sq_fops;
#ifndef MODULE #ifndef MODULE
int sq_unit; int sq_unit;
#endif #endif
#ifdef HAS_RECORD #ifdef HAS_RECORD
if (dmasound.mach.record) if (dmasound.mach.record)
sq_fops.read = sq_read ; fops = &sq_fops_record;
#endif #endif
sq_unit = register_sound_dsp(&sq_fops, -1); sq_unit = register_sound_dsp(fops, -1);
if (sq_unit < 0) { if (sq_unit < 0) {
printk(KERN_ERR "dmasound_core: couldn't register fops\n") ; printk(KERN_ERR "dmasound_core: couldn't register fops\n") ;
return sq_unit ; return sq_unit ;