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

Commit d7d7271f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 96edcf31 c95789ec

drivers/media/dvb-frontends/mb86a20s.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static void mb86a20s_layer_bitrate(struct dvb_frontend *fe, u32 layer, 
	       __func__, 'A' + layer, segment * isdbt_rate[m][f][i]/1000,

		rate, rate);



	state->estimated_rate[i] = rate;

	state->estimated_rate[layer] = rate;

}

drivers/media/pci/cx25821/cx25821-video.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ int cx25821_video_register(struct cx25821_dev *dev) 


	spin_lock_init(&dev->slock);



	for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; ++i) {

	for (i = 0; i < VID_CHANNEL_NUM; ++i) {

		cx25821_init_controls(dev, i);



		cx25821_risc_stopper(dev->pci, &dev->channels[i].vidq.stopper,