const file_operations fallout
PATCH 2/13 const file_operations fallout
Signed-off-by Al Viro <[email protected]>
--- sound/oss/dmasound/dmasound_core.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-)
sound/oss/dmasound/dmasound_core.c +16 -4
@@ -1346,22 +1346,34 @@ static const struct file_operations sq_fops = .ioctl = sq_ioctl, .open = sq_open, .release = sq_release, +}; +#ifdef HAS_RECORD - .read =NULL /* default to no read for compat mode */ -#endif +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 ) { +const struct file_operations *fops = &sq_fops;#ifndef MODULE int sq_unit;#endif #ifdef HAS_RECORD if (dmasound.mach.record) - sq_fops.read = sq_read ; + fops = &sq_fops_record;#endif - sq_unit =register_sound_dsp (&sq_fops,-1 ); + sq_unit =register_sound_dsp (fops,-1 );if (sq_unit <0 ) {printk (KERN_ERR "dmasound_core: couldn't register fops\n" ) ;return sq_unit ;
Signature · 1 line
1.5.0-rc2.GIT