[Bluetooth] Fix reference counting during ACL config stage

[safe/jmp/linux-2.6] / net / irda / iriap.c

diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 9e15c82..4a105dc 100644 (file)
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -451,12 +451,14 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
        n = 2;
 
        /* Get length, MSB first */
-       len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2;
+       len = get_unaligned_be16(fp + n);
+       n += 2;
 
        IRDA_DEBUG(4, "%s(), len=%d\n", __func__, len);
 
        /* Get object ID, MSB first */
-       obj_id = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2;
+       obj_id = get_unaligned_be16(fp + n);
+       n += 2;
 
        type = fp[n++];
        IRDA_DEBUG(4, "%s(), Value type = %d\n", __func__, type);
@@ -506,7 +508,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
                value = irias_new_string_value(fp+n);
                break;
        case IAS_OCT_SEQ:
-               value_len = be16_to_cpu(get_unaligned((__be16 *)(fp+n)));
+               value_len = get_unaligned_be16(fp + n);
                n += 2;
 
                /* Will truncate to IAS_MAX_OCTET_STRING bytes */