From 46ec249f84c804fb55d9ca26f63a973b48967fe1 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 22 Sep 2008 14:56:47 -0700
Subject: [PATCH] --- yaml --- r: 117699 b: refs/heads/master c:
 d777aaf386ba71d6fbe803c015330a766cad53d8 h: refs/heads/master i:   117697:
 1d9f7d603a59e1dd4060d355f8f67d3632f9946a   117695:
 50709200e5cf5efa1b7e9da65b46ed709b4203ee v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/scsi/ipr.c | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index db9a85796f13..2367b299e46a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ba7f18cd9d974a5b1e75a68a4f0a50f1df8585e
+refs/heads/master: d777aaf386ba71d6fbe803c015330a766cad53d8
diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c
index d30eb7ba018e..de62f4dfeb0e 100644
--- a/trunk/drivers/scsi/ipr.c
+++ b/trunk/drivers/scsi/ipr.c
@@ -2456,20 +2456,14 @@ static ssize_t ipr_read_trace(struct kobject *kobj,
 	struct Scsi_Host *shost = class_to_shost(dev);
 	struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
 	unsigned long lock_flags = 0;
-	int size = IPR_TRACE_SIZE;
-	char *src = (char *)ioa_cfg->trace;
-
-	if (off > size)
-		return 0;
-	if (off + count > size) {
-		size -= off;
-		count = size;
-	}
+	ssize_t ret;
 
 	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-	memcpy(buf, &src[off], count);
+	ret = memory_read_from_buffer(buf, count, &off, ioa_cfg->trace,
+				IPR_TRACE_SIZE);
 	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-	return count;
+
+	return ret;
 }
 
 static struct bin_attribute ipr_trace_attr = {