---

yaml --- r: 268577 b: refs/heads/master c: 8da7986 h: refs/heads/master i: 268575: 9afbe6b v: v3
git-mirror · Sep 30, 2011 · 425f264 · 425f264
1 parent e1c62ea
commit 425f264
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb0590e2723eed53b524d61cf011d53fc7280949
+refs/heads/master: 8da798634343de8dbb8c1593923f8368db69f838
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
@@ -554,6 +554,11 @@ static irqreturn_t nvec_interrupt(int irq, void *dev)
 			nvec_invalid_flags(nvec, status, true);
 		} else {
 			nvec->rx = nvec_msg_alloc(nvec, NVEC_MSG_RX);
+			/* Should not happen in a normal world */
+			if (unlikely(nvec->rx == NULL)) {
+				nvec->state = 0;
+				break;
+			}
 			nvec->rx->data[0] = received;
 			nvec->rx->pos = 1;
 			nvec->state = 2;