diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:08:59 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:08:59 -0500 |
commit | 21a2cb565a74bf794d343ce22300c5f6c1568ae1 (patch) | |
tree | 5cf49d94bc8cc31a299417b8a362f0645b41c543 /fs | |
parent | c99516ca854770000c277b2680a15581c691e18c (diff) | |
parent | 2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1 (diff) |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
* 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
isl29020: Remove a redundant semi-colon from return statement
BMP085: Remove redundant semi-colon from return statement
drivers:misc: ti-st: DEBUG uart, baud rate mods
drivers:misc: ti-st: flush UART upon fw failure
drivers:misc: ti-st: protect registrations
char_dev.c: fix up some whitespace errors
s390: tape_class.h: remove kobj_map.h inclusion
misc: ad525x_dpot: Add support for SPI module device table matching
Diffstat (limited to 'fs')
-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 dca9e5e0f73..3f152b92a94 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 | } |