diff --git a/[refs] b/[refs] index e6e4d3335e14..f8e4269ff3a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb521c5de070b86a1e049e2dbf62328f717ff1e8 +refs/heads/master: dd5d81f326da8d151939b833993b799c0d0d1d6e diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c index 3cbc57f932d2..d6db933df2b2 100644 --- a/trunk/fs/char_dev.c +++ b/trunk/fs/char_dev.c @@ -264,7 +264,6 @@ int __register_chrdev(unsigned int major, unsigned int baseminor, { struct char_device_struct *cd; struct cdev *cdev; - char *s; int err = -ENOMEM; cd = __register_chrdev_region(major, baseminor, count, name); @@ -278,8 +277,6 @@ int __register_chrdev(unsigned int major, unsigned int baseminor, cdev->owner = fops->owner; cdev->ops = fops; kobject_set_name(&cdev->kobj, "%s", name); - for (s = strchr(kobject_name(&cdev->kobj),'/'); s; s = strchr(s, '/')) - *s = '!'; err = cdev_add(cdev, MKDEV(cd->major, baseminor), count); if (err)