diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 22:27:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 22:27:27 (GMT) |
| commit | f9196e7c03bfefbb8933c7af579c3c6caa72ea53 (patch) | |
| tree | 8fa32c991375c382539c39b35603d2289b4610c6 /lib | |
| parent | bf4282cbcf7f53c23e87fb0cef945591cdc8d631 (diff) | |
| parent | 75de46b98dda624397ccb17c106e51f478a79c15 (diff) | |
| download | linux-f9196e7c03bfefbb8933c7af579c3c6caa72ea53.tar.xz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject_uevent.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 59c1551..b935795 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -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); |