From 94d7dba7be885460d1e4a5c2f2bbd2d6008f46c5 Mon Sep 17 00:00:00 2001
From: "Javier M. Mellid" <jmunhoz@igalia.com>
Date: Tue, 26 Jun 2012 06:00:16 +0200
Subject: [PATCH] --- yaml --- r: 317573 b: refs/heads/master c:
 128e8616faff1a863ad9f8e865e255ee4d36bed4 h: refs/heads/master i:   317571:
 c129d0b4dfe65d7d63cab04f4e26b0cc6234bb38 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 755c29f326e7..4cf4f7e32633 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50b238b186d4ac77da07a0fa0261467f9431581b
+refs/heads/master: 128e8616faff1a863ad9f8e865e255ee4d36bed4
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 78da77903305..e5d016b9259a 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -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