diff options
| -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 3c0a03f69d8..652273e9f5f 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 | ||
