From e9855f5bd33400470578ae0db988b09f34442465 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 30 May 2007 09:39:46 -0300 Subject: [PATCH] --- yaml --- r: 61305 b: refs/heads/master c: 25472237320b4979d38eb15bc842f592c94d20f5 h: refs/heads/master i: 61303: e49b0f89d1fb63639b2f3f143e62d1a88f522b21 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-blackbird.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9b00ce06b927..bf22bd053e10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a957641bbafc9f44050c965fe1ddc0f7b771d416 +refs/heads/master: 25472237320b4979d38eb15bc842f592c94d20f5 diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c index a80b1cb1abe8..df700cff50e9 100644 --- a/trunk/drivers/media/video/cx88/cx88-blackbird.c +++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c @@ -56,8 +56,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [blackbird]"); /* ------------------------------------------------------------------ */ -#define OLD_BLACKBIRD_FIRM_IMAGE_SIZE 262144 -#define BLACKBIRD_FIRM_IMAGE_SIZE 376836 +#define BLACKBIRD_FIRM_IMAGE_SIZE 376836 /* defines below are from ivtv-driver.h */ @@ -453,11 +452,9 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) return -1; } - if ((firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) && - (firmware->size != OLD_BLACKBIRD_FIRM_IMAGE_SIZE)) { - dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d or %d)\n", - firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE, - OLD_BLACKBIRD_FIRM_IMAGE_SIZE); + if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { + dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n", + firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE); release_firmware(firmware); return -1; }