The variable name was only released if parport_register_dev_model() fails. Now that we are using the device-model the parport driver will duplicate the name and use it. So we can release the variable after the device has been registered with the parport.
Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: Sudip Mukherjee <[email protected]> --- drivers/char/ppdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 6af1ce0..f08f3ed 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -305,10 +305,10 @@ static int register_device(int minor, struct pp_struct *pp) ppdev_cb.private = pp; pdev = parport_register_dev_model(port, name, &ppdev_cb, minor); parport_put_port(port); + kfree(name); if (!pdev) { printk(KERN_WARNING "%s: failed to register device!\n", name); - kfree(name); return -ENXIO; } -- 1.9.1
