From b280c6e1063ff84bfe81a96f1b092ce323bd41c0 Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@md.metrocast.net>
Date: Thu, 27 Jan 2011 02:34:13 -0300
Subject: [PATCH] --- yaml --- r: 242159 b: refs/heads/master c:
 8152b760effbff11cb4eef6292ae3b47719ee792 h: refs/heads/master i:   242157:
 fb4e8117ad2cc88488a5e50d093d84d1fb5d9c3f   242155:
 aa5ebb0f1155469294e87ef2adf44fd87c3372d2   242151:
 f8e1dafd9d6f766ff665b154abb6adcc88260d12   242143:
 d74a1a97f96d0d3c05b270318538cecb7e9fa472 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/lirc/lirc_zilog.c | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 7a81b81283bc..4abfd2c0b9e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 915e54733de4a36742ab78b4768750ce72662f85
+refs/heads/master: 8152b760effbff11cb4eef6292ae3b47719ee792
diff --git a/trunk/drivers/staging/lirc/lirc_zilog.c b/trunk/drivers/staging/lirc/lirc_zilog.c
index 695c3df93ca8..a62b94bf6a1a 100644
--- a/trunk/drivers/staging/lirc/lirc_zilog.c
+++ b/trunk/drivers/staging/lirc/lirc_zilog.c
@@ -67,9 +67,8 @@ struct IR_rx {
 	/* RX device */
 	struct i2c_client *c;
 
-	/* RX device buffer & lock */
+	/* RX device buffer */
 	struct lirc_buffer buf;
-	struct mutex buf_lock;
 
 	/* RX polling thread data */
 	struct task_struct *task;
@@ -718,18 +717,15 @@ 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 = ir->rx;
 	int ret = 0, written = 0;
+	unsigned int m;
 	DECLARE_WAITQUEUE(wait, current);
 
 	dprintk("read called\n");
 	if (rx == NULL)
 		return -ENODEV;
 
-	if (mutex_lock_interruptible(&rx->buf_lock))
-		return -ERESTARTSYS;
-
 	if (n % rx->buf.chunk_size) {
 		dprintk("read result = -EINVAL\n");
-		mutex_unlock(&rx->buf_lock);
 		return -EINVAL;
 	}
 
@@ -767,19 +763,19 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 			set_current_state(TASK_INTERRUPTIBLE);
 		} else {
 			unsigned char buf[rx->buf.chunk_size];
-			lirc_buffer_read(&rx->buf, buf);
-			ret = copy_to_user((void *)outbuf+written, buf,
-					   rx->buf.chunk_size);
-			written += rx->buf.chunk_size;
+			m = lirc_buffer_read(&rx->buf, buf);
+			if (m == rx->buf.chunk_size) {
+				ret = copy_to_user((void *)outbuf+written, buf,
+						   rx->buf.chunk_size);
+				written += rx->buf.chunk_size;
+			}
 		}
 	}
 
 	remove_wait_queue(&rx->buf.wait_poll, &wait);
 	set_current_state(TASK_RUNNING);
-	mutex_unlock(&rx->buf_lock);
 
-	dprintk("read result = %s (%d)\n",
-		ret ? "-EFAULT" : "OK", ret);
+	dprintk("read result = %d (%s)\n", ret, ret ? "Error" : "OK");
 
 	return ret ? ret : written;
 }
@@ -1327,7 +1323,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		if (ret)
 			goto out_free_xx;
 
-		mutex_init(&ir->rx->buf_lock);
 		ir->rx->c = client;
 		ir->rx->hdpvr_data_fmt =
 			       (id->driver_data & ID_FLAG_HDPVR) ? true : false;