---

yaml --- r: 242183 b: refs/heads/master c: cc664ae h: refs/heads/master i: 242181: 1014e01 242179: 4f95775 242175: 039da57 v: v3
git-mirror · Mar 22, 2011 · c0dbf17 · c0dbf17
1 parent 97cf1ce
commit c0dbf17
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55734785cdaff596be9a5238af54fc0f4ace2e63
+refs/heads/master: cc664ae026f1b0f3254564a7d45cc29e735c7fed
diff --git a/trunk/drivers/staging/lirc/lirc_zilog.c b/trunk/drivers/staging/lirc/lirc_zilog.c
@@ -897,7 +897,7 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 	struct IR *ir = filep->private_data;
 	struct IR_rx *rx;
 	struct lirc_buffer *rbuf = ir->l.rbuf;
-	int ret = 0, written = 0;
+	int ret = 0, written = 0, retries = 0;
 	unsigned int m;
 	DECLARE_WAITQUEUE(wait, current);
 
@@ -950,6 +950,12 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 				ret = copy_to_user((void *)outbuf+written, buf,
 						   rbuf->chunk_size);
 				written += rbuf->chunk_size;
+			} else {
+				retries++;
+			}
+			if (retries >= 5) {
+				zilog_error("Buffer read failed!\n");
+				ret = -EIO;
 			}
 		}
 	}