Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffce6266 authored by Istvan Varga's avatar Istvan Varga Committed by Mauro Carvalho Chehab
Browse files

[media] xc4000: simplified load_scode 



Removed unused code from load_scode() (all SCODE firmwares are
assumed to have the HAS_IF bit set).

Signed-off-by: default avatarIstvan Varga <istvan_v@mailbox.hu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3db95704

drivers/media/common/tuners/xc4000.c

+8 −18
Original line number Diff line number Diff line
@@ -780,8 +780,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe) 
		p += sizeof(size);



		if (!size || size > endp - p) {

			printk("Firmware type ");

			printk("(%x), id %llx is corrupted "

			printk("Firmware type (%x), id %llx is corrupted "

			       "(size=%d, expected %d)\n",

			       type, (unsigned long long)id,

			       (unsigned)(endp - p), size);
@@ -862,18 +861,9 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type, 


	p = priv->firm[pos].ptr;



	if (priv->firm[pos].type & HAS_IF) {

	if (priv->firm[pos].size != 12 * 16 || scode >= 16)

		return -EINVAL;

	p += 12 * scode;

	} else {

		/* 16 SCODE entries per file; each SCODE entry is 12 bytes and

		 * has a 2-byte size header in the firmware format. */

		if (priv->firm[pos].size != 14 * 16 || scode >= 16 ||

		    le16_to_cpu(*(__u16 *)(p + 14 * scode)) != 12)

			return -EINVAL;

		p += 14 * scode + 2;

	}



	tuner_info("Loading SCODE for type=");

	dump_firm_type_and_int_freq(priv->firm[pos].type,