aboutsummaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/rpmb-core.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/misc/rpmb-core.c b/drivers/misc/rpmb-core.c
index c8888267c222..bc68cde1a8bf 100644
--- a/drivers/misc/rpmb-core.c
+++ b/drivers/misc/rpmb-core.c
@@ -187,17 +187,15 @@ struct rpmb_dev *rpmb_dev_register(struct device *dev,
rdev->dev.parent = dev;
ret = device_register(&rdev->dev);
- if (ret)
- goto err_id_remove;
+ if (ret) {
+ put_device(&rdev->dev);
+ return ERR_PTR(ret);
+ }
dev_dbg(&rdev->dev, "registered device\n");
return rdev;
-err_id_remove:
- mutex_lock(&rpmb_mutex);
- ida_simple_remove(&rpmb_ida, rdev->id);
- mutex_unlock(&rpmb_mutex);
err_free_dev_id:
kfree(rdev->descr.dev_id);
err_free_rdev: