---

yaml --- r: 286191 b: refs/heads/master c: 59f608d h: refs/heads/master i: 286189: 1193ecb 286187: 28f347c 286183: 474b60f 286175: 9ae0370 v: v3
git-mirror · Jan 17, 2012 · 9e9da90 · 9e9da90
1 parent abefae0
commit 9e9da90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3371bb3f7ed11b7b7473a202e2713bde50dc01c0
+refs/heads/master: 59f608d84f937cb5e2fd3a0b9f848f200d47ba85
diff --git a/trunk/net/caif/caif_dev.c b/trunk/net/caif/caif_dev.c
@@ -146,15 +146,17 @@ void caif_flow_cb(struct sk_buff *skb)
 	spin_lock_bh(&caifd->flow_lock);
 	send_xoff = caifd->xoff;
 	caifd->xoff = 0;
-	if (!WARN_ON(caifd->xoff_skb_dtor == NULL)) {
-		WARN_ON(caifd->xoff_skb != skb);
-		dtor = caifd->xoff_skb_dtor;
-		caifd->xoff_skb = NULL;
-		caifd->xoff_skb_dtor = NULL;
-	}
+	dtor = caifd->xoff_skb_dtor;
+
+	if (WARN_ON(caifd->xoff_skb != skb))
+		skb = NULL;
+
+	caifd->xoff_skb = NULL;
+	caifd->xoff_skb_dtor = NULL;
+
 	spin_unlock_bh(&caifd->flow_lock);
 
-	if (dtor)
+	if (dtor && skb)
 		dtor(skb);
 
 	if (send_xoff)