summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2018-06-28 16:26:19 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2018-07-12 12:05:11 +1000
commit265aac26bcd4a2a79d08d2bdcc08cf1653fd4248 (patch)
tree0ea9f143ebe0341b91e361a81791abce1f594a0f
parent55382d301fd8992349da0e58c013400e2e72417d (diff)
downloadlinux-265aac26bcd4a2a79d08d2bdcc08cf1653fd4248.tar.gz
linux-265aac26bcd4a2a79d08d2bdcc08cf1653fd4248.tar.bz2
linux-265aac26bcd4a2a79d08d2bdcc08cf1653fd4248.zip
fsi: Don't use device_unregister() in fsi_master_register()
In the error path of fsi_master_register(), we currently use device_unregister(). This will cause the last reference to the structure to be dropped, thus freeing the enclosing structure, which isn't what the callers want. Use device_del() instead so that we return to the caller with a refcount of 1. The caller can then assume that it must use put_device() after a call to fsi_master_register() regardless of whether the latter suceeded or failed. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--drivers/fsi/fsi-core.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 372a9d8a8990..e9f8813b75e6 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -977,9 +977,6 @@ int fsi_master_register(struct fsi_master *master)
int rc;
struct device_node *np;
- if (!master)
- return -EINVAL;
-
master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL);
dev_set_name(&master->dev, "fsi%d", master->idx);
@@ -991,14 +988,14 @@ int fsi_master_register(struct fsi_master *master)
rc = device_create_file(&master->dev, &dev_attr_rescan);
if (rc) {
- device_unregister(&master->dev);
+ device_del(&master->dev);
ida_simple_remove(&master_ida, master->idx);
return rc;
}
rc = device_create_file(&master->dev, &dev_attr_break);
if (rc) {
- device_unregister(&master->dev);
+ device_del(&master->dev);
ida_simple_remove(&master_ida, master->idx);
return rc;
}