Browse Source

mei: fix debugfs files leak on error path

if dbgfs_dir is not set then debugfs_remove_recursive
is not called on the error path

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tomas Winkler 10 years ago
parent
commit
5964db0876
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/misc/mei/debugfs.c

+ 2 - 1
drivers/misc/mei/debugfs.c

@@ -204,6 +204,8 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
 	if (!dir)
 	if (!dir)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
+	dev->dbgfs_dir = dir;
+
 	f = debugfs_create_file("meclients", S_IRUSR, dir,
 	f = debugfs_create_file("meclients", S_IRUSR, dir,
 				dev, &mei_dbgfs_fops_meclients);
 				dev, &mei_dbgfs_fops_meclients);
 	if (!f) {
 	if (!f) {
@@ -228,7 +230,6 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
 		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
 		dev_err(dev->dev, "allow_fixed_address: registration failed\n");
 		goto err;
 		goto err;
 	}
 	}
-	dev->dbgfs_dir = dir;
 	return 0;
 	return 0;
 err:
 err:
 	mei_dbgfs_deregister(dev);
 	mei_dbgfs_deregister(dev);