diff options
| author | Dan Carpenter | 2010-08-25 09:12:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-09-04 02:26:28 +0200 |
| commit | 57f9bdac2510cd7fda58e4a111d250861eb1ebeb (patch) | |
| tree | c343e3d07fbab1cf7714b9bedebda95807e86cd9 /fs/sysfs | |
| parent | Linux 2.6.36-rc3 (diff) | |
| download | kernel-qcow2-linux-57f9bdac2510cd7fda58e4a111d250861eb1ebeb.tar.gz kernel-qcow2-linux-57f9bdac2510cd7fda58e4a111d250861eb1ebeb.tar.xz kernel-qcow2-linux-57f9bdac2510cd7fda58e4a111d250861eb1ebeb.zip | |
sysfs: checking for NULL instead of ERR_PTR
d_path() returns an ERR_PTR and it doesn't return NULL.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: stable <stable@kernel.org>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/sysfs')
| -rw-r--r-- | fs/sysfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 1b27b5688f62..da3fefe91a8f 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -340,7 +340,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file) char *p; p = d_path(&file->f_path, last_sysfs_file, sizeof(last_sysfs_file)); - if (p) + if (!IS_ERR(p)) memmove(last_sysfs_file, p, strlen(p) + 1); /* need attr_sd for attr and ops, its parent for kobj */ |