diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /fs/sysfs/file.c | |
parent | ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4 (diff) | |
parent | sound: Remove pr_<level> uses of KERN_<level> (diff) | |
download | linux-dev-f3fbba6efbab93b9850821d41a75b02286d18315.tar.xz linux-dev-f3fbba6efbab93b9850821d41a75b02286d18315.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'fs/sysfs/file.c')
-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 */ |