diff --git a/[refs] b/[refs] index 3bb1aaaad070..dc9c9e031f0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 895d72279da7f24f266f9583c239e7b22230127c +refs/heads/master: 07b39b49b402355a7172c113102a8b68aafb17dd diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index 479b2e79ad68..c5369ba9485a 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/drivers/video/tridentfb.c @@ -1563,6 +1563,7 @@ static void __devexit trident_pci_remove(struct pci_dev *dev) release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len); pci_set_drvdata(dev, NULL); kfree(info->pixmap.addr); + fb_dealloc_cmap(&info->cmap); framebuffer_release(info); }