diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-23 19:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-23 19:03:21 -0400 |
| commit | 536f8098026bde1368bbfcbcb9682a7637b73df2 (patch) | |
| tree | cf83d2e1afa503b6aeba103b55cd1da0af4e7a4c /drivers/video/savage/savagefb-i2c.c | |
| parent | e86ee6682b649183c11013a98be02f25e9ae399d (diff) | |
| parent | 3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/savage/savagefb-i2c.c')
| -rw-r--r-- | drivers/video/savage/savagefb-i2c.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c index 959404ad68f4..3c98457783c4 100644 --- a/drivers/video/savage/savagefb-i2c.c +++ b/drivers/video/savage/savagefb-i2c.c | |||
| @@ -274,10 +274,13 @@ int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid) | |||
| 274 | 274 | ||
| 275 | if (!edid) { | 275 | if (!edid) { |
| 276 | /* try to get from firmware */ | 276 | /* try to get from firmware */ |
| 277 | edid = kmalloc(EDID_LENGTH, GFP_KERNEL); | 277 | const u8 *e = fb_firmware_edid(info->device); |
| 278 | if (edid) | 278 | |
| 279 | memcpy(edid, fb_firmware_edid(info->device), | 279 | if (e) { |
| 280 | EDID_LENGTH); | 280 | edid = kmalloc(EDID_LENGTH, GFP_KERNEL); |
| 281 | if (edid) | ||
| 282 | memcpy(edid, e, EDID_LENGTH); | ||
| 283 | } | ||
| 281 | } | 284 | } |
| 282 | 285 | ||
| 283 | if (out_edid) | 286 | if (out_edid) |