diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:24:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:24:08 -0800 |
| commit | acb57b7548cb84680f4f5263e63736ced8c2e257 (patch) | |
| tree | ee6360d486225ef552f3e0155163744751d7eead /drivers/char | |
| parent | cf2b191cbac23d92a9b0319f80c6d274690cb9c0 (diff) | |
| parent | b13d14339baaaa720e7e5448855f33ba501917aa (diff) | |
Merge tag 'char-misc-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are three small driver fixes for some reported issues for
4.9-rc5.
One for the hyper-v subsystem, fixing up a naming issue that showed up
in 4.9-rc1, one mei driver fix, and one fix for parallel ports,
resolving a reported regression.
All have been in linux-next with no reported issues"
* tag 'char-misc-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
ppdev: fix double-free of pp->pdev->name
vmbus: make sysfs names consistent with PCI
mei: bus: fix received data size check in NFC fixup
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/ppdev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index d23368874710..6af1ce04b3da 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -748,10 +748,7 @@ static int pp_release(struct inode *inode, struct file *file) } if (pp->pdev) { - const char *name = pp->pdev->name; - parport_unregister_device(pp->pdev); - kfree(name); pp->pdev = NULL; pr_debug(CHRDEV "%x: unregistered pardevice\n", minor); } |