diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-17 02:01:19 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-17 02:01:19 +0100 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /drivers/video/savage/savagefb_driver.c | |
| parent | Merge ../linux-2.6 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| download | linux-23dd64011285010ac291f7dddf6e287bdb43a0ad.tar.xz linux-23dd64011285010ac291f7dddf6e287bdb43a0ad.zip | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/savage/savagefb_driver.c')
| -rw-r--r-- | drivers/video/savage/savagefb_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index ab727eaa7f43..10e6b3aab9ea 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c @@ -2021,8 +2021,8 @@ static int __devinit savagefb_probe (struct pci_dev* dev, #if defined(CONFIG_FB_SAVAGE_I2C) savagefb_create_i2c_busses(info); savagefb_probe_i2c_connector(info, &par->edid); - kfree(par->edid); fb_edid_to_monspecs(par->edid, &info->monspecs); + kfree(par->edid); fb_videomode_to_modelist(info->monspecs.modedb, info->monspecs.modedb_len, &info->modelist); |