On some hardware bogus chip version numbers are returned.
Try to continue without firmware.

Signed-off-by: Gon Solo <gons...@gmail.com>
---
 drivers/media/tuners/si2157.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index e87040d6eca7..615bc8a75c64 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -129,13 +129,14 @@ static int si2157_init(struct dvb_frontend *fe)
        chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |
                        cmd.args[4] << 0;
 
-       #define SI2177_A30 ('A' << 24 | 77 << 16 | '3' << 8 | '0' << 0)
-       #define SI2158_A20 ('A' << 24 | 58 << 16 | '2' << 8 | '0' << 0)
-       #define SI2148_A20 ('A' << 24 | 48 << 16 | '2' << 8 | '0' << 0)
-       #define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0)
-       #define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0)
-       #define SI2146_A10 ('A' << 24 | 46 << 16 | '1' << 8 | '0' << 0)
-       #define SI2141_A10 ('A' << 24 | 41 << 16 | '1' << 8 | '0' << 0)
+       #define SI2177_A30 ('A' << 24 |  77 << 16 | '3' << 8 | '0' << 0)
+       #define SI2158_A20 ('A' << 24 |  58 << 16 | '2' << 8 | '0' << 0)
+       #define SI2148_A20 ('A' << 24 |  48 << 16 | '2' << 8 | '0' << 0)
+       #define SI2157_A30 ('A' << 24 |  57 << 16 | '3' << 8 | '0' << 0)
+       #define SI2147_A30 ('A' << 24 |  47 << 16 | '3' << 8 | '0' << 0)
+       #define SI2146_A10 ('A' << 24 |  46 << 16 | '1' << 8 | '0' << 0)
+       #define SI2141_A10 ('A' << 24 |  41 << 16 | '1' << 8 | '0' << 0)
+       #define SI_BOGUS   (255 << 24 | 255 << 16 | 255 << 8 | 255 << 0)
 
        switch (chip_id) {
        case SI2158_A20:
@@ -148,6 +149,10 @@ static int si2157_init(struct dvb_frontend *fe)
        case SI2177_A30:
                fw_name = SI2157_A30_FIRMWARE;
                break;
+       case SI_BOGUS:
+               dev_info(&client->dev, "Bogus chip version, trying with no 
firmware\n");
+               fw_name = NULL;
+               break;
        case SI2157_A30:
        case SI2147_A30:
        case SI2146_A10:
-- 
2.20.1

Reply via email to