diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-14 16:39:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-14 16:39:47 +0100 |
| commit | b7d91c915290ab0bfbab84a0fb9c9eae57816982 (patch) | |
| tree | 75c1d0e53e297f6bd1eae2c04ed463a8f603b5cd /drivers/char/ppdev.c | |
| parent | char/pcmcia: add scr24x_cs chip card interface driver (diff) | |
| parent | Linux 4.9-rc5 (diff) | |
| download | linux-b7d91c915290ab0bfbab84a0fb9c9eae57816982.tar.xz linux-b7d91c915290ab0bfbab84a0fb9c9eae57816982.zip | |
Merge 4.9-rc5 into char-misc-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/ppdev.c')
| -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); } |