diff options
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: | |||
| 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 |