Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199464
b: refs/heads/master
c: 97dc875
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and David S. Miller committed May 29, 2010
1 parent 5f530fb commit f8fea97
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: c196b02ce60d7b1f9bc62a62c5706d4d58fbfc5a
refs/heads/master: 97dc875f90a7b88a9fa476c256345c0d40fcdf6c
6 changes: 4 additions & 2 deletions trunk/net/caif/cfserl.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,18 @@ static int cfserl_receive(struct cflayer *l, struct cfpkt *newpkt)
u8 stx = CFSERL_STX;
int ret;
u16 expectlen = 0;

caif_assert(newpkt != NULL);
spin_lock(&layr->sync);

if (layr->incomplete_frm != NULL) {

layr->incomplete_frm =
cfpkt_append(layr->incomplete_frm, newpkt, expectlen);
pkt = layr->incomplete_frm;
if (pkt == NULL)
if (pkt == NULL) {
spin_unlock(&layr->sync);
return -ENOMEM;
}
} else {
pkt = newpkt;
}
Expand Down

0 comments on commit f8fea97

Please sign in to comment.