aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Pascoe <c.pascoe@itee.uq.edu.au>2007-12-02 06:36:42 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:03:59 -0200
commitad35ce9e3e03b1515c8581bababb0e64d05cf1ad (patch)
tree712d67acac90dcf5a9d4d90c624955c3007c30f0
parente026268870b5f05a3f74b37816d96ed3b19a9e33 (diff)
V4L/DVB (6852): xc2028: s-code offset should not modify internal control structure
Don't modify the control structure that was provided at attach when applying an offset to the S-Code, otherwise it will be incorrect on subsequent tunes. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/tuner-xc2028.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index 416c717eb78..81cc7f607d4 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -956,6 +956,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
struct xc2028_data *priv = fe->tuner_priv;
unsigned int type=0;
fe_bandwidth_t bw = BANDWIDTH_8_MHZ;
+ u16 demod = 0;
tuner_dbg("%s called\n", __FUNCTION__);
@@ -1009,10 +1010,10 @@ static int xc2028_set_params(struct dvb_frontend *fe,
/* All S-code tables need a 200kHz shift */
if (priv->ctrl.demod)
- priv->ctrl.demod += 200;
+ demod = priv->ctrl.demod + 200;
return generic_set_freq(fe, p->frequency,
- T_DIGITAL_TV, type, 0, priv->ctrl.demod);
+ T_DIGITAL_TV, type, 0, demod);
}
static int xc2028_sleep(struct dvb_frontend *fe)