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: checking for NULL instead of ERR_PTR
This commit is contained in:
@@ -340,7 +340,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
|
|||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
p = d_path(&file->f_path, last_sysfs_file, sizeof(last_sysfs_file));
|
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);
|
memmove(last_sysfs_file, p, strlen(p) + 1);
|
||||||
|
|
||||||
/* need attr_sd for attr and ops, its parent for kobj */
|
/* need attr_sd for attr and ops, its parent for kobj */
|
||||||
|
Reference in New Issue
Block a user