---

yaml --- r: 61304 b: refs/heads/master c: a957641 h: refs/heads/master v: v3
git-mirror · Jul 18, 2007 · 58f3327 · 58f3327
1 parent e49b0f8
commit 58f3327
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74fa39e5902faf1f5eb3ee642e2e069875a0343e
+refs/heads/master: a957641bbafc9f44050c965fe1ddc0f7b771d416
diff --git a/trunk/drivers/media/video/ivtv/ivtv-firmware.c b/trunk/drivers/media/video/ivtv/ivtv-firmware.c
@@ -56,9 +56,7 @@ static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv
 		volatile u32 __iomem *dst = (volatile u32 __iomem *)mem;
 		const u32 *src = (const u32 *)fw->data;
 
-		/* temporarily allow 256 KB encoding firmwares as well for
-		   compatibility with blackbird cards */
-		if (fw->size != size && fw->size != 256 * 1024) {
+		if (fw->size != size) {
 			/* Due to race conditions in firmware loading (esp. with udev <0.95)
 			   the wrong file was sometimes loaded. So we check filesizes to
 			   see if at least the right-sized file was loaded. If not, then we