From 67805dd53f3e4c703e87f390190dc3815e3efb53 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Wed, 6 Jun 2007 16:15:48 -0300 Subject: [PATCH] --- yaml --- r: 61319 b: refs/heads/master c: 9af596ebc7ad3afb0df520b4becad915dd5a5584 h: refs/heads/master i: 61317: bbc719efdf50ed559ae56aefcc8e93f55b2b26ce 61315: 62c5b80996cc98c9d4a776defd9ca35be97a6959 61311: f1606b5d28cece44767b74687b5481d01b687af7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tda9887.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f37d43addec2..127c499fe445 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fd8b263678ab8430b49c99976ade681f8a78439 +refs/heads/master: 9af596ebc7ad3afb0df520b4becad915dd5a5584 diff --git a/trunk/drivers/media/video/tda9887.c b/trunk/drivers/media/video/tda9887.c index 5bb7d19edfbc..caca1092790e 100644 --- a/trunk/drivers/media/video/tda9887.c +++ b/trunk/drivers/media/video/tda9887.c @@ -599,6 +599,15 @@ static void tda9887_release(struct i2c_client *c) t->priv = NULL; } +static struct tuner_operations tda9887_tuner_ops = { + .set_tv_freq = tda9887_set_freq, + .set_radio_freq = tda9887_set_freq, + .standby = tda9887_standby, + .tuner_status = tda9887_tuner_status, + .get_afc = tda9887_get_afc, + .release = tda9887_release, +}; + int tda9887_tuner_init(struct i2c_client *c) { struct tda9887_priv *priv = NULL; @@ -614,12 +623,7 @@ int tda9887_tuner_init(struct i2c_client *c) tda9887_info("tda988[5/6/7] found @ 0x%x (%s)\n", t->i2c.addr, t->i2c.driver->driver.name); - t->ops.set_tv_freq = tda9887_set_freq; - t->ops.set_radio_freq = tda9887_set_freq; - t->ops.standby = tda9887_standby; - t->ops.tuner_status = tda9887_tuner_status; - t->ops.get_afc = tda9887_get_afc; - t->ops.release = tda9887_release; + memcpy(&t->ops, &tda9887_tuner_ops, sizeof(struct tuner_operations)); return 0; }