---

yaml --- r: 76459 b: refs/heads/master c: 47bd5bc h: refs/heads/master i: 76457: 429bcaf 76455: 219d5e3 v: v3
git-mirror · Jan 25, 2008 · ac30c2e · ac30c2e
1 parent 5763b03
commit ac30c2e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);