diff options
-rw-r--r-- | fs/char_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index dca9e5e0f73b..3f152b92a94a 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
@@ -272,7 +272,7 @@ int __register_chrdev(unsigned int major, unsigned int baseminor, | |||
272 | cd = __register_chrdev_region(major, baseminor, count, name); | 272 | cd = __register_chrdev_region(major, baseminor, count, name); |
273 | if (IS_ERR(cd)) | 273 | if (IS_ERR(cd)) |
274 | return PTR_ERR(cd); | 274 | return PTR_ERR(cd); |
275 | 275 | ||
276 | cdev = cdev_alloc(); | 276 | cdev = cdev_alloc(); |
277 | if (!cdev) | 277 | if (!cdev) |
278 | goto out2; | 278 | goto out2; |
@@ -280,7 +280,7 @@ int __register_chrdev(unsigned int major, unsigned int baseminor, | |||
280 | cdev->owner = fops->owner; | 280 | cdev->owner = fops->owner; |
281 | cdev->ops = fops; | 281 | cdev->ops = fops; |
282 | kobject_set_name(&cdev->kobj, "%s", name); | 282 | kobject_set_name(&cdev->kobj, "%s", name); |
283 | 283 | ||
284 | err = cdev_add(cdev, MKDEV(cd->major, baseminor), count); | 284 | err = cdev_add(cdev, MKDEV(cd->major, baseminor), count); |
285 | if (err) | 285 | if (err) |
286 | goto out; | 286 | goto out; |
@@ -405,7 +405,7 @@ static int chrdev_open(struct inode *inode, struct file *filp) | |||
405 | goto out_cdev_put; | 405 | goto out_cdev_put; |
406 | 406 | ||
407 | if (filp->f_op->open) { | 407 | if (filp->f_op->open) { |
408 | ret = filp->f_op->open(inode,filp); | 408 | ret = filp->f_op->open(inode, filp); |
409 | if (ret) | 409 | if (ret) |
410 | goto out_cdev_put; | 410 | goto out_cdev_put; |
411 | } | 411 | } |