diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:05:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:05:46 -0700 |
| commit | e7957ec6b6edf7838c7d7506669ffb6e28ec481b (patch) | |
| tree | 91c6c28b6d93b181bd626736d94f79ed59d7a8c8 /fs/sysfs/dir.c | |
| parent | 59c0b586aebdfff2c79d61139a2f5ea3b6d62675 (diff) | |
| parent | 83db93f4de2d9ae441a491d1dc61c2204f0195de (diff) | |
| download | kernel_samsung_espresso10-e7957ec6b6edf7838c7d7506669ffb6e28ec481b.zip kernel_samsung_espresso10-e7957ec6b6edf7838c7d7506669ffb6e28ec481b.tar.gz kernel_samsung_espresso10-e7957ec6b6edf7838c7d7506669ffb6e28ec481b.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
sysfs: Allow sysfs_notify_dirent to be called from interrupt context.
sysfs: Allow sysfs_move_dir(..., NULL) again.
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 0050fc4..5fad489 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -894,7 +894,8 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj) mutex_lock(&sysfs_rename_mutex); BUG_ON(!sd->s_parent); - new_parent_sd = new_parent_kobj->sd ? new_parent_kobj->sd : &sysfs_root; + new_parent_sd = (new_parent_kobj && new_parent_kobj->sd) ? + new_parent_kobj->sd : &sysfs_root; error = 0; if (sd->s_parent == new_parent_sd) |