hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] xc4000: Update firmware name 

The firmware name at:
   http://www.kernellabs.com/firmware/xc4000/

Is different from the one at the Kernel. Update it
try first the new name, falling back to the previous one
if the new name can't be found.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-07-21 13:28:13 -03:00
parent 157a5fe90a
commit da7bfa2c5d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/tuners/xc4000.c
View File

@ -116,6 +116,7 @@ struct xc4000_priv {
#define XC4000_AUDIO_STD_MONO 32
#define XC4000_DEFAULT_FIRMWARE "dvb-fe-xc4000-1.4.fw"
#define XC4000_DEFAULT_FIRMWARE_NEW "dvb-fe-xc4000-1.4.1.fw"
/* Misc Defines */
#define MAX_TV_STANDARD 24
@ -730,13 +731,25 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
char name[33];
const char *fname;
if (firmware_name[0] != '\0')
if (firmware_name[0] != '\0') {
fname = firmware_name;
else
fname = XC4000_DEFAULT_FIRMWARE;
dprintk(1, "Reading firmware %s\n", fname);
rc = request_firmware(&fw, fname, priv->i2c_props.adap->dev.parent);
dprintk(1, "Reading custom firmware %s\n", fname);
rc = request_firmware(&fw, fname,
priv->i2c_props.adap->dev.parent);
} else {
fname = XC4000_DEFAULT_FIRMWARE_NEW;
dprintk(1, "Trying to read firmware %s\n", fname);
rc = request_firmware(&fw, fname,
priv->i2c_props.adap->dev.parent);
if (rc == -ENOENT) {
fname = XC4000_DEFAULT_FIRMWARE;
dprintk(1, "Trying to read firmware %s\n", fname);
rc = request_firmware(&fw, fname,
priv->i2c_props.adap->dev.parent);
}
}
if (rc < 0) {
if (rc == -ENOENT)
printk(KERN_ERR "Error: firmware %s not found.\n", fname);
@ -746,6 +759,8 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
return rc;
}
dprintk(1, "Loading Firmware: %s\n", fname);
p = fw->data;
endp = p + fw->size;