diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-26 08:17:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-26 08:17:07 -0700 |
| commit | d7d7271f421f1e45289f2a737c7f636c02c673ce (patch) | |
| tree | 623e1a8587ece69dbd3a6d2da4ed005bd3f78d1f | |
| parent | 96edcf31b3b9d9f53adb110fd4c4d49b458497a9 (diff) | |
| parent | c95789ecd5a979fd718ae09763df3fa50dd97a91 (diff) | |
| download | linux-d7d7271f421f1e45289f2a737c7f636c02c673ce.tar.gz linux-d7d7271f421f1e45289f2a737c7f636c02c673ce.tar.bz2 linux-d7d7271f421f1e45289f2a737c7f636c02c673ce.zip | |
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
| -rw-r--r-- | drivers/media/dvb-frontends/mb86a20s.c | 2 | ||||
| -rw-r--r-- | drivers/media/pci/cx25821/cx25821-video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c index f19cd7367040..4faaf8053f26 100644 --- a/drivers/media/dvb-frontends/mb86a20s.c +++ b/drivers/media/dvb-frontends/mb86a20s.c @@ -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; } diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c index d4de021dc844..31ce7698acb9 100644 --- a/drivers/media/pci/cx25821/cx25821-video.c +++ b/drivers/media/pci/cx25821/cx25821-video.c @@ -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, |