Merge git://git.infradead.org/users/cbou/battery-2.6.29

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / drx397xD.c

diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index b9ca5c8d2dd9400814f64566a24952b541126a0a..1e81e713df635db0e310d3419c557c5bcce56fb1 100644 (file)
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -39,7 +39,7 @@ static const char mod_name[] = "drx397xD";
 #define F_SET_0D4h     2
 
 enum fw_ix {
-#define _FW_ENTRY(a, b)                b
+#define _FW_ENTRY(a, b, c)     b
 #include "drx397xD_fw.h"
 };
 
@@ -72,11 +72,11 @@ static struct {
        int refcnt;
        const u8 *data[ARRAY_SIZE(blob_name)];
 } fw[] = {
-#define _FW_ENTRY(a, b)                {                       \
-                       .name   = a,                    \
-                       .file   = 0,                    \
-                       .lock   = RW_LOCK_UNLOCKED,     \
-                       .refcnt = 0,                    \
+#define _FW_ENTRY(a, b, c)     {                                       \
+                       .name   = a,                                    \
+                       .file   = 0,                                    \
+                       .lock   = __RW_LOCK_UNLOCKED(fw[c].lock),       \
+                       .refcnt = 0,                                    \
                        .data   = { }           }
 #include "drx397xD_fw.h"
 };
@@ -646,7 +646,7 @@ static int drx_tune(struct drx397xD_state *s,
        u32 edi = 0, ebx = 0, ebp = 0, edx = 0;
        u16 v20 = 0, v1E = 0, v16 = 0, v14 = 0, v12 = 0, v10 = 0, v0E = 0;
 
-       int rc, df_tuner;
+       int rc, df_tuner = 0;
        int a, b, c, d;
        pr_debug("%s %d\n", __func__, s->config.d60);