diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /drivers/media/video/bt8xx/bttv-vbi.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-vbi.c')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-vbi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c index e20ff238e409..8c9f0f7cf467 100644 --- a/drivers/media/video/bt8xx/bttv-vbi.c +++ b/drivers/media/video/bt8xx/bttv-vbi.c | |||
| @@ -184,7 +184,7 @@ void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f) | |||
| 184 | - tvnorm->vbistart[0]; | 184 | - tvnorm->vbistart[0]; |
| 185 | count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1] | 185 | count1 = (s64) f->fmt.vbi.start[1] + f->fmt.vbi.count[1] |
| 186 | - tvnorm->vbistart[1]; | 186 | - tvnorm->vbistart[1]; |
| 187 | count = clamp (max (count0, count1), 1LL, (s64) VBI_MAXLINES); | 187 | count = clamp (max (count0, count1), (s64) 1, (s64) VBI_MAXLINES); |
| 188 | 188 | ||
| 189 | f->fmt.vbi.start[0] = tvnorm->vbistart[0]; | 189 | f->fmt.vbi.start[0] = tvnorm->vbistart[0]; |
| 190 | f->fmt.vbi.start[1] = tvnorm->vbistart[1]; | 190 | f->fmt.vbi.start[1] = tvnorm->vbistart[1]; |