diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 13:28:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 13:28:46 -0400 |
| commit | f68ec0c24755e5cdb779be6240925f2175311d84 (patch) | |
| tree | a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /drivers/video/pm2fb.c | |
| parent | 98920dc3d1113b883cbc73e3293446d3525c6042 (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'drivers/video/pm2fb.c')
| -rw-r--r-- | drivers/video/pm2fb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 3f1ca2adda3d..c6dd924976a4 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
| @@ -1746,6 +1746,7 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev) | |||
| 1746 | release_mem_region(fix->mmio_start, fix->mmio_len); | 1746 | release_mem_region(fix->mmio_start, fix->mmio_len); |
| 1747 | 1747 | ||
| 1748 | pci_set_drvdata(pdev, NULL); | 1748 | pci_set_drvdata(pdev, NULL); |
| 1749 | fb_dealloc_cmap(&info->cmap); | ||
| 1749 | kfree(info->pixmap.addr); | 1750 | kfree(info->pixmap.addr); |
| 1750 | kfree(info); | 1751 | kfree(info); |
| 1751 | } | 1752 | } |