From 71053cf2bb2735817a3aa7949de19913220c39f9 Mon Sep 17 00:00:00 2001
From: Robert Fitzsimons <robfitz@273k.net>
Date: Wed, 13 Feb 2008 16:38:11 -0300
Subject: [PATCH] --- yaml --- r: 85759 b: refs/heads/master c:
 7c018804c0900e7be18507f1eb24e631aa9816ea h: refs/heads/master i:   85757:
 ae7fa495c10106e58c1597fe97fe64d0bb169ecb   85755:
 bc88dc45bd51c053e7be3148454958c6b744fa83   85751:
 c5e1c8ba50cb61eb7b9bb96c4525e054ba9c551e   85743:
 0bb6d217263b227070ad94305124c19ba203fe67   85727:
 8571c94b3fc907f0152a921e023d6f12a7be81cf   85695:
 0929d7dbedba9e8533b57b3508214f1caa84263d   85631:
 603f8bf320ee9ef4292cc79682e58fb4d3483511   85503:
 a370114482318109345f25553babf64e5b7d5a31 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/bt8xx/bttv-driver.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e9ebd5c4f8bc..cc31125a51e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1
+refs/heads/master: 7c018804c0900e7be18507f1eb24e631aa9816ea
diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c
index d9ce9a48ef59..5404fcc5276d 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-driver.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-driver.c
@@ -2760,6 +2760,7 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on)
 	if (on) {
 		fh->ov.tvnorm = btv->tvnorm;
 		new = videobuf_pci_alloc(sizeof(*new));
+		new->crop = btv->crop[!!fh->do_crop].rect;
 		bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
 	} else {
 		new = NULL;