From f8fea978f264a9dde4ef1eb8077fc6aed9e6d2d0 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 26 May 2010 05:16:48 +0000 Subject: [PATCH] --- yaml --- r: 199464 b: refs/heads/master c: 97dc875f90a7b88a9fa476c256345c0d40fcdf6c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/caif/cfserl.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 30f091bd487f..748dc2097e0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c196b02ce60d7b1f9bc62a62c5706d4d58fbfc5a +refs/heads/master: 97dc875f90a7b88a9fa476c256345c0d40fcdf6c diff --git a/trunk/net/caif/cfserl.c b/trunk/net/caif/cfserl.c index cb4325a3dc83..965c5baace40 100644 --- a/trunk/net/caif/cfserl.c +++ b/trunk/net/caif/cfserl.c @@ -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; }