From b616a8445a3d28ad68045b1b6c2edf80cdc9cb51 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 27 Nov 2009 13:49:48 -0200
Subject: [PATCH] --- yaml --- r: 174197 b: refs/heads/master c:
 1ca31892e3af05ad3a72769e3c922cca3cde4f9d h: refs/heads/master i:   174195:
 cced65636357a3b773cc1925f43d948426791662 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/em28xx/em28xx.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd80ed3bcac8..d1f1c78b2dab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491aa96a8c37260d2466735ecd3c662db8c0a7af
+refs/heads/master: 1ca31892e3af05ad3a72769e3c922cca3cde4f9d
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index bca5cbb7931c..166d4a6e6eaa 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -796,7 +796,7 @@ static inline unsigned int norm_maxw(struct em28xx *dev)
 	if (dev->board.is_webcam)
 		return dev->sensor_xres;
 
-	if (dev->board.max_range_640_480)
+	if (dev->board.max_range_640_480 || dev->board.is_em2800)
 		return 640;
 
 	return 720;