diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/video/savage/savagefb_driver.c | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
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, | |||
| 2021 | #if defined(CONFIG_FB_SAVAGE_I2C) | 2021 | #if defined(CONFIG_FB_SAVAGE_I2C) |
| 2022 | savagefb_create_i2c_busses(info); | 2022 | savagefb_create_i2c_busses(info); |
| 2023 | savagefb_probe_i2c_connector(info, &par->edid); | 2023 | savagefb_probe_i2c_connector(info, &par->edid); |
| 2024 | kfree(par->edid); | ||
| 2025 | fb_edid_to_monspecs(par->edid, &info->monspecs); | 2024 | fb_edid_to_monspecs(par->edid, &info->monspecs); |
| 2025 | kfree(par->edid); | ||
| 2026 | fb_videomode_to_modelist(info->monspecs.modedb, | 2026 | fb_videomode_to_modelist(info->monspecs.modedb, |
| 2027 | info->monspecs.modedb_len, | 2027 | info->monspecs.modedb_len, |
| 2028 | &info->modelist); | 2028 | &info->modelist); |