A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Phonet: allow phonet_device_init() to fail, put it to __init section

Browse source 
Signed-off-by: Rémi Denis-Courmont <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
remi.denis-courmont@nokia 2009-01-23 03:00:27 +00:00 • committed by David S. Miller
commit 76e02cf694
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
net/phonet/af_phonet.c
View file

@ -426,16 +426,18 @@ static int __init phonet_init(void)
{
int err;
err = phonet_device_init();
if (err)
return err;
err = sock_register(&phonet_proto_family);
if (err) {
printk(KERN_ALERT
"phonet protocol family initialization failed\n");
return err;
goto err_sock;
}
phonet_device_init();
dev_add_pack(&phonet_packet_type);
phonet_netlink_register();
phonet_sysctl_init();
err = isi_register();
@ -447,6 +449,7 @@ err:
phonet_sysctl_exit();
sock_unregister(PF_PHONET);
dev_remove_pack(&phonet_packet_type);
err_sock:
phonet_device_exit();
return err;
}

4
net/phonet/pn_dev.c
View file

@ -188,9 +188,11 @@ static struct notifier_block phonet_device_notifier = {
};
/* Initialize Phonet devices list */
void phonet_device_init(void)
int __init phonet_device_init(void)
{
register_netdevice_notifier(&phonet_device_notifier);
phonet_netlink_register();
return 0;
}
void phonet_device_exit(void)