diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-02 06:30:16 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:40:22 -0400 |
commit | 0fb84ce0dbffee26dc0934496e6bcdce853fa0d0 (patch) | |
tree | a7da698a21d7b8db0e8471f54185f16f83400fc0 /drivers/media/common | |
parent | e8a4845d2a797958b1e0cb6acc5e826985ee90ce (diff) |
V4L/DVB (12846): tuner-xc2028: Fix skip code for devices with broken read (tm6000)
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/tuners/tuner-xc2028.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index 53f0fbb33cc6..61a7e138c748 100644 --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c | |||
@@ -811,6 +811,10 @@ check_device: | |||
811 | hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8, | 811 | hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8, |
812 | (version & 0xf0) >> 4, version & 0xf); | 812 | (version & 0xf0) >> 4, version & 0xf); |
813 | 813 | ||
814 | |||
815 | if (priv->ctrl.read_not_reliable) | ||
816 | goto read_not_reliable; | ||
817 | |||
814 | /* Check firmware version against what we downloaded. */ | 818 | /* Check firmware version against what we downloaded. */ |
815 | if (priv->firm_version != ((version & 0xf0) << 4 | (version & 0x0f))) { | 819 | if (priv->firm_version != ((version & 0xf0) << 4 | (version & 0x0f))) { |
816 | if (!priv->ctrl.read_not_reliable) { | 820 | if (!priv->ctrl.read_not_reliable) { |
@@ -834,6 +838,7 @@ check_device: | |||
834 | goto fail; | 838 | goto fail; |
835 | } | 839 | } |
836 | 840 | ||
841 | read_not_reliable: | ||
837 | memcpy(&priv->cur_fw, &new_fw, sizeof(priv->cur_fw)); | 842 | memcpy(&priv->cur_fw, &new_fw, sizeof(priv->cur_fw)); |
838 | 843 | ||
839 | /* | 844 | /* |