aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 036f87643e13..f366b86e4693 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -54,7 +54,6 @@ static LIST_HEAD(cx8802_devlist);
54 54
55/* ------------------------------------------------------------------ */ 55/* ------------------------------------------------------------------ */
56 56
57#define BLACKBIRD_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw"
58#define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024 57#define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
59 58
60/* defines below are from ivtv-driver.h */ 59/* defines below are from ivtv-driver.h */
@@ -575,13 +574,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
575 if (retval < 0) 574 if (retval < 0)
576 dprintk(0, "Error with register_write\n"); 575 dprintk(0, "Error with register_write\n");
577 576
578 retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME, 577 retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME,
579 &dev->pci->dev); 578 &dev->pci->dev);
580 579
581 580
582 if (retval != 0) { 581 if (retval != 0) {
583 dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n", 582 dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
584 BLACKBIRD_FIRM_ENC_FILENAME); 583 CX2341X_FIRM_ENC_FILENAME);
585 dprintk(0, "Please fix your hotplug setup, the board will " 584 dprintk(0, "Please fix your hotplug setup, the board will "
586 "not work without firmware loaded!\n"); 585 "not work without firmware loaded!\n");
587 return -1; 586 return -1;