From 42f9f900f266c1aec924602cb03106cbc67b07c8 Mon Sep 17 00:00:00 2001 From: Alina Friedrichsen Date: Sun, 23 Jan 2011 12:27:05 -0300 Subject: [PATCH] --- yaml --- r: 241837 b: refs/heads/master c: b8bc77db1e23c6e141734511db873902c66bec8c h: refs/heads/master i: 241835: dc8e0e7ba425eda34ea48125ab4a7f91c9adc22c v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/tuner-xc2028.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2e2469255b44..ce3094b231e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b97e2201eb76d56c4901d39e8ed276f2de0e2e9 +refs/heads/master: b8bc77db1e23c6e141734511db873902c66bec8c diff --git a/trunk/drivers/media/common/tuners/tuner-xc2028.c b/trunk/drivers/media/common/tuners/tuner-xc2028.c index b6ce528e1889..d95f3b256e30 100644 --- a/trunk/drivers/media/common/tuners/tuner-xc2028.c +++ b/trunk/drivers/media/common/tuners/tuner-xc2028.c @@ -685,7 +685,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, { struct xc2028_data *priv = fe->tuner_priv; struct firmware_properties new_fw; - int rc = 0, is_retry = 0; + int rc = 0, retry_count = 0; u16 version, hwmodel; v4l2_std_id std0; @@ -855,9 +855,9 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, fail: memset(&priv->cur_fw, 0, sizeof(priv->cur_fw)); - if (!is_retry) { + if (retry_count < 8) { msleep(50); - is_retry = 1; + retry_count++; tuner_dbg("Retrying firmware load\n"); goto retry; }