From f11e80f0488430167b8573ede8a6f102c2de6660 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 8 Jan 2008 11:26:59 -0300 Subject: [PATCH] --- yaml --- r: 192683 b: refs/heads/master c: e5cc2bf4450fd9739534e690cc16efc140d7b7fc h: refs/heads/master i: 192681: 2588a7161d80cd2d0fa0c0fbe759630b59e80950 192679: 38e39e6eb9473071bd811e679a477eda7a4a7174 v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/tuner-xc2028.c | 5 ++++- trunk/drivers/media/common/tuners/tuner-xc2028.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ac6c76742f72..83110c69d081 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6eb5c8a6c82d7c753ea52df94ea2ff096b5aba96 +refs/heads/master: e5cc2bf4450fd9739534e690cc16efc140d7b7fc diff --git a/trunk/drivers/media/common/tuners/tuner-xc2028.c b/trunk/drivers/media/common/tuners/tuner-xc2028.c index 96d61707f501..8d2907f38a94 100644 --- a/trunk/drivers/media/common/tuners/tuner-xc2028.c +++ b/trunk/drivers/media/common/tuners/tuner-xc2028.c @@ -100,6 +100,7 @@ struct xc2028_data { if (size != _rc) \ tuner_info("i2c output error: rc = %d (should be %d)\n",\ _rc, (int)size); \ + msleep(priv->ctrl.msleep); \ _rc; \ }) @@ -119,6 +120,7 @@ struct xc2028_data { if (isize != _rc) \ tuner_err("i2c input error: rc = %d (should be %d)\n", \ _rc, (int)isize); \ + msleep(priv->ctrl.msleep); \ _rc; \ }) @@ -130,7 +132,7 @@ struct xc2028_data { _val, sizeof(_val)))) { \ tuner_err("Error on line %d: %d\n", __LINE__, _rc); \ } else \ - msleep(10); \ + msleep(priv->ctrl.msleep); \ _rc; \ }) @@ -996,6 +998,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */, The reset CLK is needed only with tm6000. Driver should work fine even if this fails. */ + msleep(priv->ctrl.msleep); do_tuner_callback(fe, XC2028_RESET_CLK, 1); msleep(10); diff --git a/trunk/drivers/media/common/tuners/tuner-xc2028.h b/trunk/drivers/media/common/tuners/tuner-xc2028.h index a90c35d50add..e116071810e0 100644 --- a/trunk/drivers/media/common/tuners/tuner-xc2028.h +++ b/trunk/drivers/media/common/tuners/tuner-xc2028.h @@ -33,6 +33,7 @@ enum firmware_type { struct xc2028_ctrl { char *fname; int max_len; + int msleep; unsigned int scode_table; unsigned int mts :1; unsigned int input1:1;