diff options
| author | Antonino A. Daplas | 2005-09-15 20:58:57 +0800 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-15 08:24:09 -0700 |
| commit | 7b6a186d65589901a73d460070504a5e02703c45 (patch) | |
| tree | adc52e885b8ffbf50853b6f67eb55e6a6c2a4f2b /drivers/video/savage/savagefb-i2c.c | |
| parent | be201f7f4cd26b1bb994062803e0d87877e749ce (diff) | |
[PATCH] savagefb: Fix load failure of the Twister chipset
- The Twister chipsets are actually prosavages. Reclassify them as
such and remove the S3_SAVAGE_TWISTER id.
- Fix i2c code if fb_firmware_edid() returns NULL
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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) if (!edid) { /* try to get from firmware */ - edid = kmalloc(EDID_LENGTH, GFP_KERNEL); - if (edid) - memcpy(edid, fb_firmware_edid(info->device), - EDID_LENGTH); + const u8 *e = fb_firmware_edid(info->device); + + if (e) { + edid = kmalloc(EDID_LENGTH, GFP_KERNEL); + if (edid) + memcpy(edid, e, EDID_LENGTH); + } } if (out_edid) |