Commit fb0e76c5 authored by Patrick Mochel's avatar Patrick Mochel

sysfs: fix more merge breakage.

parent 004ced81
...@@ -51,6 +51,7 @@ int sysfs_create(struct dentry * dentry, int mode, int (*init)(struct inode *)) ...@@ -51,6 +51,7 @@ int sysfs_create(struct dentry * dentry, int mode, int (*init)(struct inode *))
goto Proceed; goto Proceed;
else else
error = -ENOMEM; error = -ENOMEM;
} else
error = -EEXIST; error = -EEXIST;
} else } else
error = -ENOENT; error = -ENOENT;
...@@ -97,6 +98,7 @@ void sysfs_hash_and_remove(struct dentry * dir, const char * name) ...@@ -97,6 +98,7 @@ void sysfs_hash_and_remove(struct dentry * dir, const char * name)
pr_debug("sysfs: Removing %s (%d)\n", victim->d_name.name, pr_debug("sysfs: Removing %s (%d)\n", victim->d_name.name,
atomic_read(&victim->d_count)); atomic_read(&victim->d_count));
/*
* Drop reference from initial sysfs_get_dentry(). * Drop reference from initial sysfs_get_dentry().
*/ */
dput(victim); dput(victim);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment