aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-05-29 06:18:55 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:23:50 -0400
commita957641bbafc9f44050c965fe1ddc0f7b771d416 (patch)
tree1dd7afa1d61c35af62ca2a8846506ad530583c4c
parent74fa39e5902faf1f5eb3ee642e2e069875a0343e (diff)
V4L/DVB (5729): Remove support for 256 Kb firmware files.
For backwards compatibility firmware files of 256 Kb were allowed: all drivers have now been updated to support the newer larger firmwares so remove this compatibility code and only support the newer firmware. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/ivtv/ivtv-firmware.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index d4c910b782af..2b6208a6a108 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -56,9 +56,7 @@ retry:
56 volatile u32 __iomem *dst = (volatile u32 __iomem *)mem; 56 volatile u32 __iomem *dst = (volatile u32 __iomem *)mem;
57 const u32 *src = (const u32 *)fw->data; 57 const u32 *src = (const u32 *)fw->data;
58 58
59 /* temporarily allow 256 KB encoding firmwares as well for 59 if (fw->size != size) {
60 compatibility with blackbird cards */
61 if (fw->size != size && fw->size != 256 * 1024) {
62 /* Due to race conditions in firmware loading (esp. with udev <0.95) 60 /* Due to race conditions in firmware loading (esp. with udev <0.95)
63 the wrong file was sometimes loaded. So we check filesizes to 61 the wrong file was sometimes loaded. So we check filesizes to
64 see if at least the right-sized file was loaded. If not, then we 62 see if at least the right-sized file was loaded. If not, then we