From 9174dcaf36d9774365e36bbc2b2983f4516fd8d2 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Mon, 17 Oct 2011 11:59:44 +0200
Subject: [PATCH] --- yaml --- r: 269749 b: refs/heads/master c:
 74b5ea307689b5abf577670b40965921d5dba4d5 h: refs/heads/master i:   269747:
 767d29ba9135ebefc69d13d5b2bf95d3f1bc6a50 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c  | 4 +---
 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3f3680337cee..cf5d0c2bdcc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60a16a30d97e8acc9bfed5f4bd1dd03e21a479ea
+refs/heads/master: 74b5ea307689b5abf577670b40965921d5dba4d5
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index a8830d730dc1..92f56bc594eb 100644
--- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -362,8 +362,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
 int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv)
 {
 	struct drm_device *dev = dev_priv->dev;
-	int i;
-	int ret;
+	int i, ret;
 
 	if (dev_priv->ldu_priv) {
 		DRM_INFO("ldu system already on\n");
@@ -371,7 +370,6 @@ int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv)
 	}
 
 	dev_priv->ldu_priv = kmalloc(sizeof(*dev_priv->ldu_priv), GFP_KERNEL);
-
 	if (!dev_priv->ldu_priv)
 		return -ENOMEM;
 
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 319516f4ace2..477b2a9eb3c2 100644
--- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -502,8 +502,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
 int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv)
 {
 	struct drm_device *dev = dev_priv->dev;
-	int i;
-	int ret;
+	int i, ret;
 
 	if (dev_priv->sou_priv) {
 		DRM_INFO("sou system already on\n");
@@ -530,7 +529,7 @@ int vmw_kms_init_screen_object_display(struct vmw_private *dev_priv)
 	if (unlikely(ret != 0))
 		goto err_free;
 
-	ret = drm_mode_create_dirty_info_property(dev_priv->dev);
+	ret = drm_mode_create_dirty_info_property(dev);
 	if (unlikely(ret != 0))
 		goto err_vblank_cleanup;