vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / misc.c

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 13b1127..0937544 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -207,10 +207,9 @@ static struct file_operations misc_fops = {
 int misc_register(struct miscdevice * misc)
 {
        struct miscdevice *c;
-       struct class_device *class;
        dev_t dev;
        int err;
-       
+
        down(&misc_sem);
        list_for_each_entry(c, &misc_list, list) {
                if (c->minor == misc->minor) {
@@ -224,8 +223,7 @@ int misc_register(struct miscdevice * misc)
                while (--i >= 0)
                        if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
                                break;
-               if (i<0)
-               {
+               if (i<0) {
                        up(&misc_sem);
                        return -EBUSY;
                }
@@ -240,10 +238,10 @@ int misc_register(struct miscdevice * misc)
        }
        dev = MKDEV(MISC_MAJOR, misc->minor);
 
-       class = class_simple_device_add(misc_class, dev,
-                                       misc->dev, misc->name);
-       if (IS_ERR(class)) {
-               err = PTR_ERR(class);
+       misc->class = class_simple_device_add(misc_class, dev,
+                                             misc->dev, misc->name);
+       if (IS_ERR(misc->class)) {
+               err = PTR_ERR(misc->class);
                goto out;
        }