diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 18:19:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 18:19:55 -0700 |
| commit | 28a78e46f04ac5c4952533f2938a18699f207004 (patch) | |
| tree | 2991c5cea8d7f912abbe59e315fd1ed03febe45c /fs | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | b0d1f807f340e91b27aa721f6474956af11571da (diff) | |
| download | op-kernel-dev-28a78e46f04ac5c4952533f2938a18699f207004.zip op-kernel-dev-28a78e46f04ac5c4952533f2938a18699f207004.tar.gz | |
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/debugfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index b80bc84..0de5e26 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -498,7 +498,7 @@ void debugfs_remove(struct dentry *dentry) struct dentry *parent; int ret; - if (!dentry) + if (IS_ERR_OR_NULL(dentry)) return; parent = dentry->d_parent; @@ -530,7 +530,7 @@ void debugfs_remove_recursive(struct dentry *dentry) struct dentry *child; struct dentry *parent; - if (!dentry) + if (IS_ERR_OR_NULL(dentry)) return; parent = dentry->d_parent; |
