renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

[media] ds3000: add module parameter to force firmware upload

Browse Source 
[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: Rémi Cardona <remi.cardona@smartjog.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Rémi Cardona 2012-09-28 08:59:31 -03:00 committed by Mauro Carvalho Chehab
parent c2c1b4156a
commit 034351ff63
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/dvb-frontends/ds3000.c
View File

@ -30,6 +30,7 @@
#include "ds3000.h" #include "ds3000.h"
static int debug; static int debug;
static int force_fw_upload;
#define dprintk(args...) \ #define dprintk(args...) \
do { \ do { \
@ -392,11 +393,13 @@ static int ds3000_firmware_ondemand(struct dvb_frontend *fe)
dprintk("%s()\n", __func__); dprintk("%s()\n", __func__);
if (ds3000_readreg(state, 0xb2) <= 0) ret = ds3000_readreg(state, 0xb2);
if (ret < 0)
return ret; return ret;
if (state->skip_fw_load) if (state->skip_fw_load || !force_fw_upload)
return 0; return 0; /* Firmware already uploaded, skipping */
/* Load firmware */ /* Load firmware */
/* request the firmware, this will block until someone uploads it */ /* request the firmware, this will block until someone uploads it */
printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__, printk(KERN_INFO "%s: Waiting for firmware upload (%s)...\n", __func__,
@ -1306,6 +1309,9 @@ static struct dvb_frontend_ops ds3000_ops = {
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)"); MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
module_param(force_fw_upload, int, 0644);
MODULE_PARM_DESC(force_fw_upload, "Force firmware upload (default:0)");
MODULE_DESCRIPTION("DVB Frontend module for Montage Technology " MODULE_DESCRIPTION("DVB Frontend module for Montage Technology "
"DS3000/TS2020 hardware"); "DS3000/TS2020 hardware");
MODULE_AUTHOR("Konstantin Dimitrov"); MODULE_AUTHOR("Konstantin Dimitrov");