staging: sm7xxfb: delete unnecessary color map allocation
authorJavier M. Mellid <jmunhoz@igalia.com>
Tue, 26 Jun 2012 04:00:16 +0000 (06:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jun 2012 22:03:54 +0000 (15:03 -0700)
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>
drivers/staging/sm7xxfb/sm7xxfb.c

index 78da7790330550018025f75e6552f84877c93839..e5d016b9259ad9517057e6c723d1d4c96c208129 100644 (file)
@@ -696,6 +696,14 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name)
        return sfb;
 }
 
+/*
+ * 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