diff --git a/[refs] b/[refs]
index 07525a4fa41c..827d56b4e203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b8ca4cf53e04f377944228b66ddc7d5d593e705
+refs/heads/master: a9e8d70c1ac6c9ccf6852c91e082e28249564e6e
diff --git a/trunk/drivers/staging/omapdrm/omap_fbdev.c b/trunk/drivers/staging/omapdrm/omap_fbdev.c
index ba4530697fe8..96940bbfc6f4 100644
--- a/trunk/drivers/staging/omapdrm/omap_fbdev.c
+++ b/trunk/drivers/staging/omapdrm/omap_fbdev.c
@@ -377,11 +377,11 @@ void omap_fbdev_free(struct drm_device *dev)
 
 	fbdev = to_omap_fbdev(priv->fbdev);
 
-	kfree(fbdev);
-
 	/* this will free the backing object */
 	if (fbdev->fb)
 		fbdev->fb->funcs->destroy(fbdev->fb);
 
+	kfree(fbdev);
+
 	priv->fbdev = NULL;
 }