diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-blackbird.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index a80b1cb1abe8..df700cff50e9 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -56,8 +56,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [blackbird]"); | |||
56 | 56 | ||
57 | /* ------------------------------------------------------------------ */ | 57 | /* ------------------------------------------------------------------ */ |
58 | 58 | ||
59 | #define OLD_BLACKBIRD_FIRM_IMAGE_SIZE 262144 | 59 | #define BLACKBIRD_FIRM_IMAGE_SIZE 376836 |
60 | #define BLACKBIRD_FIRM_IMAGE_SIZE 376836 | ||
61 | 60 | ||
62 | /* defines below are from ivtv-driver.h */ | 61 | /* defines below are from ivtv-driver.h */ |
63 | 62 | ||
@@ -453,11 +452,9 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) | |||
453 | return -1; | 452 | return -1; |
454 | } | 453 | } |
455 | 454 | ||
456 | if ((firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) && | 455 | if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) { |
457 | (firmware->size != OLD_BLACKBIRD_FIRM_IMAGE_SIZE)) { | 456 | dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n", |
458 | dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d or %d)\n", | 457 | firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE); |
459 | firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE, | ||
460 | OLD_BLACKBIRD_FIRM_IMAGE_SIZE); | ||
461 | release_firmware(firmware); | 458 | release_firmware(firmware); |
462 | return -1; | 459 | return -1; |
463 | } | 460 | } |