summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-05-29 12:18:55 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2007-05-29 12:18:55 +0200
commitaeb264b9d3485ae825e2d3db5ff68fcc3fd4483b (patch)
tree902573b41ad0a89937ce791f2a778cd32fc19066 /linux
parent6a60b7c1f736f406059a8e5ae1afdedc6a2101db (diff)
downloadmediapointer-dvb-s2-aeb264b9d3485ae825e2d3db5ff68fcc3fd4483b.tar.gz
mediapointer-dvb-s2-aeb264b9d3485ae825e2d3db5ff68fcc3fd4483b.tar.bz2
Remove support for 256 Kb firmware files.
From: Hans Verkuil <hverkuil@xs4all.nl> 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>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-firmware.c4
1 files changed, 1 insertions, 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