]> err.no Git - linux-2.6/commitdiff
V4L/DVB (6652): xc2028: try non-8MHZ init1 firmware
authorChris Pascoe <c.pascoe@itee.uq.edu.au>
Tue, 20 Nov 2007 02:43:13 +0000 (23:43 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 25 Jan 2008 21:02:35 +0000 (19:02 -0200)
When loading init1 firmware, there may not be an 8MHz specific version.
Load the non-8MHz version if it exists.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/tuner-xc2028.c

index 5b646fed340fcff3a93629964493359dda2d1b3b..429e81be697e334b5bf26f939b63126bdc458454 100644 (file)
@@ -706,6 +706,9 @@ retry:
        tuner_dbg("Load init1 firmware, if exists\n");
 
        rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &std0);
+       if (rc == -ENOENT)
+               rc = load_firmware(fe, (BASE | INIT1 | new_fw.type) & ~F8MHZ,
+                                  &std0);
        if (rc < 0 && rc != -ENOENT) {
                tuner_err("Error %d while loading init1 firmware\n",
                          rc);