From e2e487506eb6bc150db77f1f1978a84fec4eefee Mon Sep 17 00:00:00 2001
From: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Date: Fri, 19 Mar 2010 14:58:23 -0300
Subject: [PATCH] --- yaml --- r: 192959 b: refs/heads/master c:
 0a062033f727dc041691bfd768f4cf0598f559a1 h: refs/heads/master i:   192957:
 19c87035dda82be561d9c8e7c5be82cb58472c1b   192955:
 4466ebd8bd2cee4b8c5aeb208e009f1133abd7cc   192951:
 ccc51da87afb3316e436e382d6332b0666b8b851   192943:
 21f0e72a078ca93988d1f5efa572c2271377f3fe   192927:
 910c61fdc5ad50c688048b7c704b2c0f6b909ed7   192895:
 96171b06c5d670649fa1ef9158ab525f6cf7665c v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/media/video/saa7134/saa7134-video.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0e0ae66c006e..35336d414670 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b0691cfc714a0f4dff582c913de1a3a68cb38a7
+refs/heads/master: 0a062033f727dc041691bfd768f4cf0598f559a1
diff --git a/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c
index 31138d3e51bb..7806fb17e742 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-video.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-video.c
@@ -1632,8 +1632,15 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv,
 	}
 
 	f->fmt.pix.field = field;
-	v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2,
-			      &f->fmt.pix.height, 32, maxh, 0, 0);
+	if (f->fmt.pix.width  < 48)
+		f->fmt.pix.width  = 48;
+	if (f->fmt.pix.height < 32)
+		f->fmt.pix.height = 32;
+	if (f->fmt.pix.width > maxw)
+		f->fmt.pix.width = maxw;
+	if (f->fmt.pix.height > maxh)
+		f->fmt.pix.height = maxh;
+	f->fmt.pix.width &= ~0x03;
 	f->fmt.pix.bytesperline =
 		(f->fmt.pix.width * fmt->depth) >> 3;
 	f->fmt.pix.sizeimage =