Merge 3.3-rc2 into the driver-core-next branch.
This was done to resolve a merge and build problem with the drivers/acpi/processor_driver.c file. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@ -315,8 +315,11 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha
|
||||
struct sysfs_addrm_cxt acxt;
|
||||
struct sysfs_dirent *sd;
|
||||
|
||||
if (!dir_sd)
|
||||
if (!dir_sd) {
|
||||
WARN(1, KERN_WARNING "sysfs: can not remove '%s', no directory\n",
|
||||
name);
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
sysfs_addrm_start(&acxt, dir_sd);
|
||||
|
||||
|
Reference in New Issue
Block a user