tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
"Two driver fixes.

One avoids reading any file at a system with a cx25821 board
(fortunately, this is not a common device). The other one prevents
reading after a buffer with ISDB-T devices based on mb86a20s."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] cx25821: do not expose broken video output streams
[media] mb86a20s: Fix estimate_rate setting

Linus Torvalds d7d7271f 96edcf31

+2 -2
+1 -1
drivers/media/dvb-frontends/mb86a20s.c
··· 610 610 __func__, 'A' + layer, segment * isdbt_rate[m][f][i]/1000, 611 611 rate, rate); 612 612 613 - state->estimated_rate[i] = rate; 613 + state->estimated_rate[layer] = rate; 614 614 } 615 615 616 616
+1 -1
drivers/media/pci/cx25821/cx25821-video.c
··· 461 461 462 462 spin_lock_init(&dev->slock); 463 463 464 - for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; ++i) { 464 + for (i = 0; i < VID_CHANNEL_NUM; ++i) { 465 465 cx25821_init_controls(dev, i); 466 466 467 467 cx25821_risc_stopper(dev->pci, &dev->channels[i].vidq.stopper,