summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorJavier M. Mellid <jmunhoz@igalia.com>2012-06-26 06:00:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-26 15:03:54 -0700
commit128e8616faff1a863ad9f8e865e255ee4d36bed4 (patch)
tree0b7ccec7c118e202edb3e1509881699679f9942e /drivers/staging
parent50b238b186d4ac77da07a0fa0261467f9431581b (diff)
staging: sm7xxfb: delete unnecessary color map allocation
This patchs erases fb_alloc_cmap call in smtc_free_fb_info. In the future, when needed, the required function to call here should be fb_dealloc_cmap. Tested with SM712. Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/sm7xxfb/sm7xxfb.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 78da77903305..e5d016b9259a 100644
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -697,6 +697,14 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name)
}
/*
+ * free struct smtcfb_info
+ */
+static void smtc_free_fb_info(struct smtcfb_info *sfb)
+{
+ kfree(sfb);
+}
+
+/*
* Unmap in the memory mapped IO registers
*/
@@ -755,14 +763,6 @@ static inline void sm7xx_init_hw(void)
outb_p(0x11, 0x3c5);
}
-static void smtc_free_fb_info(struct smtcfb_info *sfb)
-{
- if (sfb) {
- fb_alloc_cmap(&sfb->fb.cmap, 0, 0);
- kfree(sfb);
- }
-}
-
/*
* sm712vga_setup - process command line options, get vga parameter
* @options: string of options