From aeb264b9d3485ae825e2d3db5ff68fcc3fd4483b Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 29 May 2007 12:18:55 +0200 Subject: Remove support for 256 Kb firmware files. From: Hans Verkuil 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 --- linux/drivers/media/video/ivtv/ivtv-firmware.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linux/drivers/media/video/ivtv/ivtv-firmware.c b/linux/drivers/media/video/ivtv/ivtv-firmware.c index d4c910b78..2b6208a6a 100644 --- a/linux/drivers/media/video/ivtv/ivtv-firmware.c +++ b/linux/drivers/media/video/ivtv/ivtv-firmware.c @@ -56,9 +56,7 @@ retry: 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 -- cgit v1.2.3