Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b7440a14f28492bac30d7d43fd982fd210c6e971

Authored by Anand Gadiyar
Committed by Gustavo F. Padovan
1 parent 15c4794fe2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Bluetooth: fix build break on hci_sock.c 

Linux-next as of 20110217 complains when building for OMAP1.

  LD      vmlinux
`hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o
`hci_sock_cleanup' referenced in section `.init.text' of net/built-in.o: defined in discarded section `.exit.text' of net/built-in.o
make: *** [vmlinux] Error 1

A recent patch by Gustavo (Bluetooth: Merge L2CAP and SCO modules
into bluetooth.ko) introduced this by calling the hci_sock_cleanup
function in the error path of bt_init.

Fix this by dropping the __exit marking for hci_sock_cleanup.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

net/bluetooth/hci_sock.c
Diff comments   View file @ b7440a1
... ... @@ -861,7 +861,7 @@
861 861 return err;
862 862 }
863 863  
864   -void __exit hci_sock_cleanup(void)
  864 +void hci_sock_cleanup(void)
865 865 {
866 866 if (bt_sock_unregister(BTPROTO_HCI) < 0)
867 867 BT_ERR("HCI socket unregistration failed");