xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Browse Source 
Trivial manual merge fixup for usb_find_interface clashes.
This commit is contained in:
Linus Torvalds
2006-01-04 18:44:12 -08:00
parent 631b034724 fd586bacf4
commit db9edfd7e3
64 changed files with 878 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_sysfs_if.c
View File

@@ -248,7 +248,7 @@ int br_sysfs_addif(struct net_bridge_port *p)
if (err)
goto out2;
kobject_hotplug(&p->kobj, KOBJ_ADD);
kobject_uevent(&p->kobj, KOBJ_ADD);
return 0;
out2:
kobject_del(&p->kobj);
@@ -260,7 +260,7 @@ void br_sysfs_removeif(struct net_bridge_port *p)
{
pr_debug("br_sysfs_removeif\n");
sysfs_remove_link(&p->br->ifobj, p->dev->name);
kobject_hotplug(&p->kobj, KOBJ_REMOVE);
kobject_uevent(&p->kobj, KOBJ_REMOVE);
kobject_del(&p->kobj);
}