---

yaml --- r: 164491 b: refs/heads/master c: 470967d h: refs/heads/master i: 164489: e51acb0 164487: e477bdb v: v3
git-mirror · Sep 22, 2009 · 00bdf44 · 00bdf44
1 parent 636dbb8
commit 00bdf44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 734f3fa18d460995c8621cf2331b7fba88c977ce
+refs/heads/master: 470967dc6c38696f853b7f338eb9d743c28a9e11
diff --git a/trunk/drivers/char/pcmcia/cm4000_cs.c b/trunk/drivers/char/pcmcia/cm4000_cs.c
@@ -1017,7 +1017,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
 		}
 	}
 
-	if (dev->proto == 0 && count > dev->rlen - dev->rpos) {
+	if (dev->proto == 0 && count > dev->rlen - dev->rpos && i) {
 		DEBUGP(4, dev, "T=0 and count > buffer\n");
 		dev->rbuf[i] = dev->rbuf[i - 1];
 		dev->rbuf[i - 1] = dev->procbyte;