sdhci: graceful handling of bad addresses

[linux-2.6-omap-h63xx.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 46df2e403df871b131abfa10a8ec22faf8565256..6aef8f24e581699ab99399959184666d5b363285 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -129,8 +129,7 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb)
 
        conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle));
        if (conn) {
-               __le16 policy = get_unaligned((__le16 *) (sent + 2));
-               conn->link_policy = __le16_to_cpu(policy);
+               conn->link_policy = get_unaligned_le16(sent + 2);
        }
 
        hci_dev_unlock(hdev);
@@ -313,7 +312,7 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb
                return;
 
        if (!status) {
-               __u16 setting = __le16_to_cpu(get_unaligned((__le16 *) sent));
+               __u16 setting = get_unaligned_le16(sent);
 
                if (hdev->voice_setting != setting) {
                        hdev->voice_setting = setting;
@@ -1152,8 +1151,8 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
                struct hci_conn *conn;
                __u16  handle, count;
 
-               handle = __le16_to_cpu(get_unaligned(ptr++));
-               count  = __le16_to_cpu(get_unaligned(ptr++));
+               handle = get_unaligned_le16(ptr++);
+               count  = get_unaligned_le16(ptr++);
 
                conn = hci_conn_hash_lookup_handle(hdev, handle);
                if (conn) {