Merge branches 'perf-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent...

[linux-flexiantxendom0-3.2.10.git] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index dca9e5e..3f152b9 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -272,7 +272,7 @@ int __register_chrdev(unsigned int major, unsigned int baseminor,
        cd = __register_chrdev_region(major, baseminor, count, name);
        if (IS_ERR(cd))
                return PTR_ERR(cd);
-       
+
        cdev = cdev_alloc();
        if (!cdev)
                goto out2;
@@ -280,7 +280,7 @@ int __register_chrdev(unsigned int major, unsigned int baseminor,
        cdev->owner = fops->owner;
        cdev->ops = fops;
        kobject_set_name(&cdev->kobj, "%s", name);
-               
+
        err = cdev_add(cdev, MKDEV(cd->major, baseminor), count);
        if (err)
                goto out;
@@ -405,7 +405,7 @@ static int chrdev_open(struct inode *inode, struct file *filp)
                goto out_cdev_put;
 
        if (filp->f_op->open) {
-               ret = filp->f_op->open(inode,filp);
+               ret = filp->f_op->open(inode, filp);
                if (ret)
                        goto out_cdev_put;
        }