---

yaml --- r: 105549 b: refs/heads/master c: a882ef4 h: refs/heads/master i: 105547: e3dda7e v: v3
git-mirror · Jul 24, 2008 · 7004b8f · 7004b8f
1 parent 89514f0
commit 7004b8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c554ff9554d67b4db0fb5e2f78c7cb4b2e0d627
+refs/heads/master: a882ef47c7156e8cc47e72f2aa396f2514569c48
diff --git a/trunk/drivers/video/aty/radeon_base.c b/trunk/drivers/video/aty/radeon_base.c
@@ -2098,15 +2098,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
 
 static ssize_t radeon_show_one_edid(char *buf, loff_t off, size_t count, const u8 *edid)
 {
-	if (off > EDID_LENGTH)
-		return 0;
-
-	if (off + count > EDID_LENGTH)
-		count = EDID_LENGTH - off;
-
-	memcpy(buf, edid + off, count);
-
-	return count;
+	return memory_read_from_buffer(buf, count, &off, edid, EDID_LENGTH);
 }