Commit 25472237 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

V4L/DVB (5733): Blackbird should accept only new cx2341x encoding firmwares

Remove temporary support for older 256 kB firmwares.
ivtv, pvrusb2 and blackbird can now all handle the newer larger firmwares,
so support for the older (buggier) firmware can be removed.
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a957641b
...@@ -56,7 +56,6 @@ MODULE_PARM_DESC(debug,"enable debug messages [blackbird]"); ...@@ -56,7 +56,6 @@ 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 */ /* defines below are from ivtv-driver.h */
...@@ -453,11 +452,9 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) ...@@ -453,11 +452,9 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
return -1; return -1;
} }
if ((firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) && if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
(firmware->size != OLD_BLACKBIRD_FIRM_IMAGE_SIZE)) { dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d or %d)\n", firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE);
firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE,
OLD_BLACKBIRD_FIRM_IMAGE_SIZE);
release_firmware(firmware); release_firmware(firmware);
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment