aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-12-06 21:12:39 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-29 20:50:06 (GMT)
commit6c3725332de55c0b668fe6c92fa45dcf8bf00fb9 (patch)
tree8dbee9b77664a1a9d73efc73e8aabb59ca0b241b
parentc7011845ca72b52c0cac133a8cb5ffb602431705 (diff)
[media] si2157: print chip version
Print chip version once using log level into when init() is called. Remove cold/warm state printing as those are not very useful. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/tuners/si2157.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 6ae7620..27b488b 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -128,7 +128,8 @@ static int si2157_init(struct dvb_frontend *fe)
case SI2157_A30:
case SI2147_A30:
case SI2146_A10:
- goto skip_fw_download;
+ fw_file = NULL;
+ break;
default:
dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n",
cmd.args[2], cmd.args[1],
@@ -137,9 +138,11 @@ static int si2157_init(struct dvb_frontend *fe)
goto err;
}
- /* cold state - try to download firmware */
- dev_info(&client->dev, "found a '%s' in cold state\n",
- si2157_ops.info.name);
+ dev_info(&client->dev, "found a 'Silicon Labs Si21%d-%c%c%c'\n",
+ cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]);
+
+ if (fw_file == NULL)
+ goto skip_fw_download;
/* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, &client->dev);

Privacy Policy