Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d7d7271f421f1e45289f2a737c7f636c02c673ce

Authored by Linus Torvalds
2 parents 96edcf31b3 c95789ecd5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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

Showing 2 changed files Side-by-side Diff

drivers/media/dvb-frontends/mb86a20s.c
Diff comments   View file @ d7d7271
... ... @@ -610,7 +610,7 @@
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  
drivers/media/pci/cx25821/cx25821-video.c
Diff comments   View file @ d7d7271
... ... @@ -461,7 +461,7 @@
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,