Commit d7d7271f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'v4l_for_linus' of git://

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://
  [media] cx25821: do not expose broken video output streams
  [media] mb86a20s: Fix estimate_rate setting
parents 96edcf31 c95789ec
......@@ -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;
......@@ -461,7 +461,7 @@ int cx25821_video_register(struct cx25821_dev *dev)
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,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment