summaryrefslogtreecommitdiff
path: root/drivers/parport/share.c
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2019-07-19 12:40:22 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-07-19 12:40:22 -0400
commitca79234af3a9e6d942763a58956b337e69bf1340 (patch)
treee3b923f28f8e1282a16a0b55d7dce7e2b0a9fa44 /drivers/parport/share.c
parent858848641fbecd42437e36adc9291b0ce5db379e (diff)
parent3bd837bfe431839a378e9d421af05b2e22a6d329 (diff)
Merge tag 'v4.19.59' into v4.19-rt
This is the 4.19.59 stable release
Diffstat (limited to 'drivers/parport/share.c')
-rw-r--r--drivers/parport/share.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index 5dc53d420ca8..7b4ee33c1935 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -895,6 +895,7 @@ parport_register_dev_model(struct parport *port, const char *name,
par_dev->devmodel = true;
ret = device_register(&par_dev->dev);
if (ret) {
+ kfree(par_dev->state);
put_device(&par_dev->dev);
goto err_put_port;
}
@@ -912,6 +913,7 @@ parport_register_dev_model(struct parport *port, const char *name,
spin_unlock(&port->physport->pardevice_lock);
pr_debug("%s: cannot grant exclusive access for device %s\n",
port->name, name);
+ kfree(par_dev->state);
device_unregister(&par_dev->dev);
goto err_put_port;
}