---

yaml --- r: 233425 b: refs/heads/master c: da1ab3e h: refs/heads/master i: 233423: a42923d v: v3
git-mirror · Feb 14, 2011 · 18df466 · 18df466
1 parent 9a16c26
commit 18df466
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b89db0e84bef81f6aa324f8f22a9258ff873de3
+refs/heads/master: da1ab3e233eb1ff4116b178006a89ddca7dcd928
diff --git a/trunk/drivers/atm/solos-pci.c b/trunk/drivers/atm/solos-pci.c
@@ -866,8 +866,9 @@ static int popen(struct atm_vcc *vcc)
 	}
 
 	skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
-	if (!skb && net_ratelimit()) {
-		dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
+	if (!skb) {
+		if (net_ratelimit())
+			dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
 		return -ENOMEM;
 	}
 	header = (void *)skb_put(skb, sizeof(*header));