From 1c346c977d56a1430a1e9f786692312655854eff Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 19 Jul 2010 15:28:41 +0200
Subject: [PATCH] --- yaml --- r: 205095 b: refs/heads/master c:
 6d6a413aa23c8bc7a5787596e06f3d6d8d4f11c7 h: refs/heads/master i:   205093:
 dccd703c7dffc5045e8bfa3163bfc5df8ac1a614   205091:
 9d3ffaa8174db49159bfe266785075798efad504   205087:
 4ce8679c17cbe0b7248ac445a49a9a7b40bbfec9 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/i2c/ch7006_drv.c  | 4 ++--
 trunk/drivers/gpu/drm/i2c/ch7006_priv.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d39f3ce7b984..1b7df7fc99b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67eda20e6b7a757ed45f6b5a8a4d30c2a0d47c7a
+refs/heads/master: 6d6a413aa23c8bc7a5787596e06f3d6d8d4f11c7
diff --git a/trunk/drivers/gpu/drm/i2c/ch7006_drv.c b/trunk/drivers/gpu/drm/i2c/ch7006_drv.c
index 3e2c9da6c81e..833b35f44a77 100644
--- a/trunk/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/trunk/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -33,7 +33,7 @@ static void ch7006_encoder_set_config(struct drm_encoder *encoder,
 {
 	struct ch7006_priv *priv = to_ch7006_priv(encoder);
 
-	priv->params = params;
+	priv->params = *(struct ch7006_encoder_params *)params;
 }
 
 static void ch7006_encoder_destroy(struct drm_encoder *encoder)
@@ -114,7 +114,7 @@ static void ch7006_encoder_mode_set(struct drm_encoder *encoder,
 {
 	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
 	struct ch7006_priv *priv = to_ch7006_priv(encoder);
-	struct ch7006_encoder_params *params = priv->params;
+	struct ch7006_encoder_params *params = &priv->params;
 	struct ch7006_state *state = &priv->state;
 	uint8_t *regs = state->regs;
 	struct ch7006_mode *mode = priv->mode;
diff --git a/trunk/drivers/gpu/drm/i2c/ch7006_priv.h b/trunk/drivers/gpu/drm/i2c/ch7006_priv.h
index b06d3d93d8ac..1c6d2e3bd96f 100644
--- a/trunk/drivers/gpu/drm/i2c/ch7006_priv.h
+++ b/trunk/drivers/gpu/drm/i2c/ch7006_priv.h
@@ -77,7 +77,7 @@ struct ch7006_state {
 };
 
 struct ch7006_priv {
-	struct ch7006_encoder_params *params;
+	struct ch7006_encoder_params params;
 	struct ch7006_mode *mode;
 
 	struct ch7006_state state;