mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
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: fix setattr error handling in sysfs, configfs kobject: free memory if netlink_kernel_create() fails lib/kobject_uevent.c: fix CONIG_NET=n warning
This commit is contained in:
commit
f9196e7c03
3 changed files with 11 additions and 7 deletions
|
|
@ -83,6 +83,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
|
||||
{
|
||||
struct kobject *kobj = data;
|
||||
|
|
@ -98,6 +99,7 @@ static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int kobj_usermode_filter(struct kobject *kobj)
|
||||
{
|
||||
|
|
@ -378,6 +380,7 @@ static int uevent_net_init(struct net *net)
|
|||
if (!ue_sk->sk) {
|
||||
printk(KERN_ERR
|
||||
"kobject_uevent: unable to create netlink socket!\n");
|
||||
kfree(ue_sk);
|
||||
return -ENODEV;
|
||||
}
|
||||
mutex_lock(&uevent_sock_mutex);
|
||||
|
|
|
|||
Loading…
Reference in a new issue