---

yaml --- r: 268578 b: refs/heads/master c: 210ceb4 h: refs/heads/master v: v3
git-mirror · Sep 30, 2011 · d5e9860 · d5e9860
1 parent 425f264
commit d5e9860
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8da798634343de8dbb8c1593923f8368db69f838
+refs/heads/master: 210ceb4f68dcc7bede2e3af547abd6f661a7bfda
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
@@ -439,11 +439,16 @@ static void nvec_tx_completed(struct nvec_chip *nvec)
  */
 static void nvec_rx_completed(struct nvec_chip *nvec)
 {
-	if (nvec->rx->pos != nvec_msg_size(nvec->rx))
+	if (nvec->rx->pos != nvec_msg_size(nvec->rx)) {
 		dev_err(nvec->dev, "RX incomplete: Expected %u bytes, got %u\n",
 			   (uint) nvec_msg_size(nvec->rx),
 			   (uint) nvec->rx->pos);
 
+		nvec_msg_free(nvec, nvec->rx);
+		nvec->state = 0;
+		return;
+	}
+
 	spin_lock(&nvec->rx_lock);
 
 	/* add the received data to the work list