mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
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
This commit is contained in:
commit
21a2cb565a
10 changed files with 126 additions and 126 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue