diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2008-07-24 00:31:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:39 -0400 |
commit | a882ef47c7156e8cc47e72f2aa396f2514569c48 (patch) | |
tree | 3ff4f73f18c8b4557af40a8f8f3a33b6893a7331 /drivers/video/aty/radeon_base.c | |
parent | 1c554ff9554d67b4db0fb5e2f78c7cb4b2e0d627 (diff) |
aty: use memory_read_from_buffer()
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 3c0a03f69d83..652273e9f5f9 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -2098,15 +2098,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
2098 | 2098 | ||
2099 | static ssize_t radeon_show_one_edid(char *buf, loff_t off, size_t count, const u8 *edid) | 2099 | static ssize_t radeon_show_one_edid(char *buf, loff_t off, size_t count, const u8 *edid) |
2100 | { | 2100 | { |
2101 | if (off > EDID_LENGTH) | 2101 | return memory_read_from_buffer(buf, count, &off, edid, EDID_LENGTH); |
2102 | return 0; | ||
2103 | |||
2104 | if (off + count > EDID_LENGTH) | ||
2105 | count = EDID_LENGTH - off; | ||
2106 | |||
2107 | memcpy(buf, edid + off, count); | ||
2108 | |||
2109 | return count; | ||
2110 | } | 2102 | } |
2111 | 2103 | ||
2112 | 2104 | ||