diff options
| -rw-r--r-- | zaptel-base.c | 13 | ||||
| -rw-r--r-- | zaptel.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/zaptel-base.c b/zaptel-base.c index e152fa4..45b08f2 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -153,6 +153,7 @@ static struct proc_dir_entry *proc_entries[ZT_MAX_SPANS]; /* Here are a couple important little additions for devfs */ #ifdef CONFIG_DEVFS_FS +#define ZT_DEVFS_MODE (S_IFCHR|S_IRUGO|S_IWUGO) static devfs_handle_t zaptel_devfs_dir; static devfs_handle_t channel; static devfs_handle_t pseudo; @@ -7345,7 +7346,7 @@ int zt_register_chardev(struct zt_chardev *dev) #endif /* CONFIG_ZAP_UDEV */ #ifdef CONFIG_DEVFS_FS - dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, mode, &zt_fops, NULL); + dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, ZT_DEVFS_MODE, &zt_fops, NULL); #endif /* CONFIG_DEVFS_FS */ return 0; @@ -7381,15 +7382,13 @@ static int __init zt_init(void) { #ifdef CONFIG_DEVFS_FS { - umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO; - devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops); if (!(zaptel_devfs_dir = devfs_mk_dir(NULL, "zap", NULL))) return -EBUSY; /* This would be bad */ - timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, ZT_MAJOR, 253, mode, &zt_fops, NULL); - channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, ZT_MAJOR, 254, mode, &zt_fops, NULL); - pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, ZT_MAJOR, 255, mode, &zt_fops, NULL); - ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL); + timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, ZT_MAJOR, 253, ZT_DEVFS_MODE, &zt_fops, NULL); + channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, ZT_MAJOR, 254, ZT_DEVFS_MODE, &zt_fops, NULL); + pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, ZT_MAJOR, 255, ZT_DEVFS_MODE, &zt_fops, NULL); + ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, ZT_DEVFS_MODE, &zt_fops, NULL); } #else if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) { @@ -1203,7 +1203,7 @@ struct zt_chardev { const char *name; __u8 minor; #ifdef CONFIG_DEVFS_FS - static devfs_handle_t devfs_handle; + devfs_handle_t devfs_handle; #endif }; |