From 58f3327fbb2b7df47e21f18b3bb7f4abf9b47cec Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 29 May 2007 07:18:55 -0300 Subject: [PATCH] --- yaml --- r: 61304 b: refs/heads/master c: a957641bbafc9f44050c965fe1ddc0f7b771d416 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-firmware.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 17bc1fad7b39..9b00ce06b927 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74fa39e5902faf1f5eb3ee642e2e069875a0343e +refs/heads/master: a957641bbafc9f44050c965fe1ddc0f7b771d416 diff --git a/trunk/drivers/media/video/ivtv/ivtv-firmware.c b/trunk/drivers/media/video/ivtv/ivtv-firmware.c index d4c910b782af..2b6208a6a108 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-firmware.c +++ b/trunk/drivers/media/video/ivtv/ivtv-firmware.c @@ -56,9 +56,7 @@ static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv 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