Changeset 129


Ignore:
Timestamp:
Jun 12, 2007, 6:52:29 AM (13 years ago)
Author:
Brendan Oakley
Message:

Rolled back file_operations struct update because it caused a Trap E.

Location:
GPL/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • GPL/trunk/alsa-kernel/core/control.c

    r126 r129  
    12931293{
    12941294#ifdef LINUX_2_3
    1295  .owner=   THIS_MODULE,
     1295    THIS_MODULE,
    12961296#endif
    1297         .read=          snd_ctl_read,
    1298         .poll=          snd_ctl_poll,
    1299         .ioctl=         snd_ctl_ioctl,
    1300         .open=          snd_ctl_open,
    1301         .release=       snd_ctl_release,
    1302         .fasync=        snd_ctl_fasync,
     1297    0,
     1298    snd_ctl_read,
     1299    0,0,
     1300    snd_ctl_poll,
     1301    snd_ctl_ioctl,
     1302    0,
     1303    snd_ctl_open,0,
     1304    snd_ctl_release,
     1305    0,
     1306    snd_ctl_fasync,
     1307    0,0,0
    13031308};
    13041309
  • GPL/trunk/alsa-kernel/core/info.c

    r126 r129  
    505505{
    506506#ifdef LINUX_2_3
    507 .owner=         THIS_MODULE,
    508 #endif
    509         .llseek=        snd_info_entry_llseek,
    510         .read=          snd_info_entry_read,
    511         .write=         snd_info_entry_write,
    512         .poll=          snd_info_entry_poll,
    513         .ioctl=         snd_info_entry_ioctl,
    514         .mmap=          snd_info_entry_mmap,
    515 //      .open=          snd_info_entry_open,
    516         .release=       snd_info_entry_release,
     507    THIS_MODULE,
     508#endif
     509    snd_info_entry_llseek,
     510    snd_info_entry_read,
     511    snd_info_entry_write,
     512    0,
     513    snd_info_entry_poll,
     514    snd_info_entry_ioctl,
     515    snd_info_entry_mmap,
     516    0,
     517    //  snd_info_entry_open,
     518    0,
     519    snd_info_entry_release,
     520    0,0,0,0,0
    517521};
    518522#else
  • GPL/trunk/alsa-kernel/core/seq/seq_clientmgr.c

    r126 r129  
    25192519        .release =      snd_seq_release,
    25202520        .poll =         snd_seq_poll,
    2521         .unlocked_ioctl =       snd_seq_ioctl,
    2522         .compat_ioctl = snd_seq_ioctl_compat,
     2521        .ioctl =        snd_seq_ioctl,
     2522#ifndef TARGET_OS2
     2523        .compat_ioctl = snd_seq_ioctl_compat,
     2524#endif
    25232525};
    25242526
  • GPL/trunk/alsa-kernel/core/sound.c

    r126 r129  
    165165struct file_operations snd_fops =
    166166{
    167         .open=  snd_open
     167    0,0,0,0,0,0,0,
     168    snd_open,0,0,0,0,0,0,0
    168169};
    169170#else
  • GPL/trunk/include/linux/fs.h

    r126 r129  
    235235        unsigned int (*poll) (struct file *, struct poll_table_struct *);
    236236        int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
    237         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
    238         long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
    239237        int (*mmap) (struct file *, struct vm_area_struct *);
    240238        int (*open) (struct inode *, struct file *);
Note: See TracChangeset for help on using the changeset viewer.