Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95893
b: refs/heads/master
c: 260ffee
h: refs/heads/master
i:
  95891: 30d2eb5
v: v3
  • Loading branch information
Harvey Harrison authored and David S. Miller committed May 2, 2008
1 parent 07be566 commit ccd086c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b4192bbd85d29eb3bec7f9297d6464250e6a7a90
refs/heads/master: 260ffeed3fd185d29f08e98fb47c09e71bb59cd8
8 changes: 5 additions & 3 deletions trunk/net/irda/iriap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit ccd086c

Please sign in to comment.