diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-05-29 14:18:55 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 21:23:50 +0400 |
| commit | a957641bbafc9f44050c965fe1ddc0f7b771d416 (patch) | |
| tree | 1dd7afa1d61c35af62ca2a8846506ad530583c4c /drivers/media/video/ivtv/ivtv-firmware.c | |
| parent | 74fa39e5902faf1f5eb3ee642e2e069875a0343e (diff) | |
| download | linux-a957641bbafc9f44050c965fe1ddc0f7b771d416.tar.xz | |
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>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-firmware.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-firmware.c | 4 |
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: 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 |