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

Commit 155ec9e6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'work-fixes'

parents 8e2cc1af 8a59822f

drivers/media/dvb/dvb-core/demux.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct dmx_frontend { 
/*--------------------------------------------------------------------------*/



/*

 * Flags OR'ed in the capabilites field of struct dmx_demux.

 * Flags OR'ed in the capabilities field of struct dmx_demux.

 */



#define DMX_TS_FILTERING                        1

drivers/media/dvb/dvb-usb/dvb-usb-init.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_device *d) 


	d->state = DVB_USB_STATE_INIT;



/* check the capabilites and set appropriate variables */

/* check the capabilities and set appropriate variables */



/* speed - when running at FULL speed we need a HW PID filter */

	if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {

drivers/media/dvb/dvb-usb/dvb-usb.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct dvb_usb_device; 


/**

 * struct dvb_usb_properties - properties of a dvb-usb-device

 * @caps: capabilites of the DVB USB device.

 * @caps: capabilities of the DVB USB device.

 * @pid_filter_count: number of PID filter position in the optional hardware

 *  PID-filter.

 *

drivers/media/dvb/ttpci/av7110.c

+1 −1
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ static int check_firmware(struct av7110* av7110) 
	len = ntohl(*(u32*) ptr);

	ptr += 4;

	if (len >= 512) {

		printk("dvb-ttpci: dpram file is way to big.\n");

		printk("dvb-ttpci: dpram file is way too big.\n");

		return -EINVAL;

	}

	if (crc != crc32_le(0, ptr, len)) {

drivers/media/dvb/ttpci/av7110_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110) 


	/* test DEBI */

	iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);

	/* FIXME: Why does Nexus CA require 2x iwdebi for first init? */

	iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);



	if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) {

		printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: "

		       "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",