Commit dfaae69b authored by Maksim Krasnyanskiy's avatar Maksim Krasnyanskiy

Merge bk://linux-bt@linux-bt.bkbits.net/bt-2.5

into qualcomm.com:/usr/src/bt-2.5
parents 71660e15 e24993fb
...@@ -472,7 +472,7 @@ int hci_sock_setsockopt(struct socket *sock, int level, int optname, char *optva ...@@ -472,7 +472,7 @@ int hci_sock_setsockopt(struct socket *sock, int level, int optname, char *optva
f->type_mask = uf.type_mask; f->type_mask = uf.type_mask;
f->opcode = uf.opcode; f->opcode = uf.opcode;
*((u32 *) f->event_mask + 0) = uf.event_mask[0]; *((u32 *) f->event_mask + 0) = uf.event_mask[0];
*((u32 *) f->event_mask + 1) = uf.event_mask[0]; *((u32 *) f->event_mask + 1) = uf.event_mask[1];
} }
break; break;
...@@ -522,7 +522,7 @@ int hci_sock_getsockopt(struct socket *sock, int level, int optname, char *optva ...@@ -522,7 +522,7 @@ int hci_sock_getsockopt(struct socket *sock, int level, int optname, char *optva
uf.type_mask = f->type_mask; uf.type_mask = f->type_mask;
uf.opcode = f->opcode; uf.opcode = f->opcode;
uf.event_mask[0] = *((u32 *) f->event_mask + 0); uf.event_mask[0] = *((u32 *) f->event_mask + 0);
uf.event_mask[0] = *((u32 *) f->event_mask + 1); uf.event_mask[1] = *((u32 *) f->event_mask + 1);
} }
len = MIN(len, sizeof(uf)); len = MIN(len, sizeof(uf));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment