Update of /cvsroot/alsa/alsa-kernel/core
In directory usw-pr-cvs1:/tmp/cvs-serv12791/core
Modified Files:
info.c
Log Message:
Changed module options: snd_xxxx ==> xxxx; patch by Chris Rankin
Index: info.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/info.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- info.c 2 Oct 2002 06:28:20 -0000 1.20
+++ info.c 22 Oct 2002 08:52:16 -0000 1.21
@@ -76,7 +76,7 @@
#ifdef CONFIG_PROC_FS
-extern int snd_major;
+extern int major;
extern struct file_operations snd_fops;
static DECLARE_MUTEX(info_mutex);
@@ -885,8 +885,8 @@
entry = (snd_info_entry_t *) de->data;
if (entry == NULL)
return;
- inode->i_gid = snd_device_gid;
- inode->i_uid = snd_device_uid;
+ inode->i_gid = device_gid;
+ inode->i_uid = device_uid;
inode->i_rdev = MKDEV(entry->c.device.major, entry->c.device.minor);
}
@@ -907,16 +907,16 @@
#ifdef CONFIG_DEVFS_FS
char dname[32];
#endif
- unsigned short major = number >> 16;
+ unsigned short _major = number >> 16;
unsigned short minor = (unsigned short) number;
snd_info_entry_t *entry;
struct proc_dir_entry *p = NULL;
- if (!major)
- major = snd_major;
+ if (!_major)
+ _major = major;
if (!mode)
mode = S_IFCHR | S_IRUGO | S_IWUGO;
- mode &= (snd_device_mode & (S_IRUGO | S_IWUGO)) | S_IFCHR | S_IFBLK;
+ mode &= (device_mode & (S_IRUGO | S_IWUGO)) | S_IFCHR | S_IFBLK;
entry = snd_info_create_module_entry(THIS_MODULE, name, NULL);
if (entry == NULL)
return NULL;
@@ -940,8 +940,8 @@
snd_info_free_entry(entry);
return NULL;
}
- p->gid = snd_device_gid;
- p->uid = snd_device_uid;
+ p->gid = device_gid;
+ p->uid = device_uid;
p->data = (void *) entry;
entry->p = p;
up(&info_mutex);
-------------------------------------------------------
This sf.net emial is sponsored by: Influence the future of
Java(TM) technology. Join the Java Community Process(SM) (JCP(SM))
program now. http://ad.doubleclick.net/clk;4699841;7576301;v?
http://www.sun.com/javavote
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
