From 1b107d0b5cca1e1bdc0c71f032bca0d437df7fc8 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Wed, 6 Jun 2007 16:15:15 -0300
Subject: [PATCH] --- yaml --- r: 61318 b: refs/heads/master c:
 7fd8b263678ab8430b49c99976ade681f8a78439 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/tda8290.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2f4f186f5dc1..f37d43addec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22bcb07ad4555fe7ac4ce724c8ad1de889f9477
+refs/heads/master: 7fd8b263678ab8430b49c99976ade681f8a78439
diff --git a/trunk/drivers/media/video/tda8290.c b/trunk/drivers/media/video/tda8290.c
index 99122ff4e81c..9c1b64c51c02 100644
--- a/trunk/drivers/media/video/tda8290.c
+++ b/trunk/drivers/media/video/tda8290.c
@@ -603,6 +603,14 @@ static void tda8290_release(struct i2c_client *c)
 	t->priv = NULL;
 }
 
+static struct tuner_operations tda8290_tuner_ops = {
+	.set_tv_freq    = set_tv_freq,
+	.set_radio_freq = set_radio_freq,
+	.has_signal     = has_signal,
+	.standby        = standby,
+	.release        = tda8290_release,
+};
+
 int tda8290_init(struct i2c_client *c)
 {
 	struct tda8290_priv *priv = NULL;
@@ -667,11 +675,8 @@ int tda8290_init(struct i2c_client *c)
 	}
 	tuner_info("type set to %s\n", c->name);
 
-	t->ops.set_tv_freq    = set_tv_freq;
-	t->ops.set_radio_freq = set_radio_freq;
-	t->ops.has_signal = has_signal;
-	t->ops.standby = standby;
-	t->ops.release = tda8290_release;
+	memcpy(&t->ops, &tda8290_tuner_ops, sizeof(struct tuner_operations));
+
 	priv->tda827x_lpsel = 0;
 	t->mode = V4L2_TUNER_ANALOG_TV;