diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /drivers/char/ppdev.c | |
parent | x86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff) | |
parent | x86/cpufeatures: Enable new AVX512 cpu features (diff) | |
download | linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.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); } |