diff --git a/[refs] b/[refs]
index 76dc796aa0a8..12da83a823fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed54c0e33c6ac72c681f00a41b47840f6570262c
+refs/heads/master: b00aff6a36aeafc68cf9044751041ba432ab4495
diff --git a/trunk/drivers/media/dvb/frontends/dib9000.c b/trunk/drivers/media/dvb/frontends/dib9000.c
index 43fb6e45424a..91518761a2da 100644
--- a/trunk/drivers/media/dvb/frontends/dib9000.c
+++ b/trunk/drivers/media/dvb/frontends/dib9000.c
@@ -486,10 +486,11 @@ static int dib9000_mbx_host_init(struct dib9000_state *state, u8 risc_id)
 #define MAX_MAILBOX_TRY 100
 static int dib9000_mbx_send_attr(struct dib9000_state *state, u8 id, u16 * data, u8 len, u16 attr)
 {
-	u8 ret = 0, *d, b[2];
+	u8 *d, b[2];
 	u16 tmp;
 	u16 size;
 	u32 i;
+	int ret = 0;
 
 	if (!state->platform.risc.fw_is_running)
 		return -EINVAL;