From ac30c2ea82664e68eda861a46a4120c9750abf4a Mon Sep 17 00:00:00 2001 From: Chris Pascoe Date: Mon, 19 Nov 2007 23:11:37 -0300 Subject: [PATCH] --- yaml --- r: 76459 b: refs/heads/master c: 47bd5bc6486a5288aa3002533c24c8e9e564f9ac h: refs/heads/master i: 76457: 429bcaf96b4b5f37c6ad2ea6cc35d329fcf25de9 76455: 219d5e3de23fcb139b8486606f3ab3774b5c6b1b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-xc2028.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 13c510438d42..70fbd199a120 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aeb012bbf460171b75ba17dc064a543f7256521f +refs/heads/master: 47bd5bc6486a5288aa3002533c24c8e9e564f9ac diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c index 8f9ccaee9bb5..115738d75f3e 100644 --- a/trunk/drivers/media/video/tuner-xc2028.c +++ b/trunk/drivers/media/video/tuner-xc2028.c @@ -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__); @@ -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); @@ -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);