---

yaml --- r: 174197 b: refs/heads/master c: 1ca3189 h: refs/heads/master i: 174195: cced656 v: v3
git-mirror · Dec 5, 2009 · b616a84 · b616a84
1 parent 4523159
commit b616a84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;