diff options
| author | Greg Kroah-Hartman <[email protected]> | 2019-01-15 14:20:53 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2019-01-15 14:20:53 +0000 |
| commit | bdfe0df1e97beedc15f68ee6556830548e81f63f (patch) | |
| tree | ed4f0eb7acb8814642eb1fb4da0ac28704dc4fe0 /fs/sysfs/dir.c | |
| parent | driver core: drop use of BUS_ATTR() (diff) | |
| parent | Linux 5.0-rc2 (diff) | |
| download | kernel-bdfe0df1e97beedc15f68ee6556830548e81f63f.tar.gz kernel-bdfe0df1e97beedc15f68ee6556830548e81f63f.zip | |
Merge 5.0-rc2 into driver-core-next
We want the driver core changes in that branch in here to build on top
of.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'fs/sysfs/dir.c')
| -rw-r--r-- | fs/sysfs/dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index feeae8081c22..aa85f2874a9f 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -43,7 +43,8 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns) kuid_t uid; kgid_t gid; - BUG_ON(!kobj); + if (WARN_ON(!kobj)) + return -EINVAL; if (kobj->parent) parent = kobj->parent->sd; |