Skip to content

Commit

Permalink
V4L/DVB (6650): xc2028: base firmwares should have std0
Browse files Browse the repository at this point in the history
When loading BASE firmware, we must use std = 0.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Chris Pascoe authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent aeb012b commit 47bd5bc
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/media/video/tuner-xc2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
unsigned int type = 0;
struct firmware_properties new_fw;
u16 version, hwmodel;
v4l2_std_id std0;

tuner_dbg("%s called\n", __FUNCTION__);

Expand Down Expand Up @@ -690,7 +691,9 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
if (rc < 0)
goto fail;

rc = load_firmware(fe, BASE | new_fw.type, &new_fw.id);
/* BASE firmwares are all std0 */
std0 = 0;
rc = load_firmware(fe, BASE | new_fw.type, &std0);
if (rc < 0) {
tuner_err("Error %d while loading base firmware\n",
rc);
Expand All @@ -700,7 +703,7 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
/* Load INIT1, if needed */
tuner_dbg("Load init1 firmware, if exists\n");

rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &new_fw.id);
rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &std0);
if (rc < 0 && rc != -ENOENT) {
tuner_err("Error %d while loading init1 firmware\n",
rc);
Expand Down

0 comments on commit 47bd5bc

Please sign in to comment.