git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth...
[pandora-kernel.git]
/
net
/
bluetooth
/
hci_sock.c
diff --git
a/net/bluetooth/hci_sock.c
b/net/bluetooth/hci_sock.c
index
1499132
..
747fabd
100644
(file)
--- a/
net/bluetooth/hci_sock.c
+++ b/
net/bluetooth/hci_sock.c
@@
-84,7
+84,7
@@
static struct hci_sec_filter hci_sec_filter = {
};
static struct bt_sock_list hci_sk_list = {
};
static struct bt_sock_list hci_sk_list = {
- .lock =
RW_LOCK_UNLOCKED
+ .lock =
__RW_LOCK_UNLOCKED(hci_sk_list.lock)
};
/* Send frame to RAW socket */
};
/* Send frame to RAW socket */
@@
-440,7
+440,7
@@
static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
skb->dev = (void *) hdev;
if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
skb->dev = (void *) hdev;
if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
- u16 opcode =
__le16_to_cpu(get_unaligned((__le16 *) skb->data)
);
+ u16 opcode =
get_unaligned_le16(skb->data
);
u16 ogf = hci_opcode_ogf(opcode);
u16 ocf = hci_opcode_ocf(opcode);
u16 ogf = hci_opcode_ogf(opcode);
u16 ocf = hci_opcode_ocf(opcode);
@@
-734,7
+734,7
@@
error:
return err;
}
return err;
}
-
int
__exit hci_sock_cleanup(void)
+
void
__exit hci_sock_cleanup(void)
{
if (bt_sock_unregister(BTPROTO_HCI) < 0)
BT_ERR("HCI socket unregistration failed");
{
if (bt_sock_unregister(BTPROTO_HCI) < 0)
BT_ERR("HCI socket unregistration failed");
@@
-742,6
+742,4
@@
int __exit hci_sock_cleanup(void)
hci_unregister_notifier(&hci_sock_nblock);
proto_unregister(&hci_sk_proto);
hci_unregister_notifier(&hci_sock_nblock);
proto_unregister(&hci_sk_proto);
-
- return 0;
}
}