From 494733c9d8e367ee11d1c95055507ee0b988590a Mon Sep 17 00:00:00 2001
From: Anton Nurkin <ptqa@netup.ru>
Date: Thu, 16 Aug 2012 10:55:40 -0300
Subject: [PATCH] --- yaml --- r: 330928 b: refs/heads/master c:
 4b83a7a75375f9d5edd1fb0067986a0f23695ddd h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/pci/cx23885/altera-ci.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 54484190d10d..47b6160eb8d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a23dc24cd007a1dd6efade8384dbe735b3b0d4f
+refs/heads/master: 4b83a7a75375f9d5edd1fb0067986a0f23695ddd
diff --git a/trunk/drivers/media/pci/cx23885/altera-ci.c b/trunk/drivers/media/pci/cx23885/altera-ci.c
index 1fa8927f0d36..aee7f0dacff1 100644
--- a/trunk/drivers/media/pci/cx23885/altera-ci.c
+++ b/trunk/drivers/media/pci/cx23885/altera-ci.c
@@ -724,6 +724,7 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
 	if (temp_int != NULL) {
 		inter = temp_int->internal;
 		(inter->cis_used)++;
+                inter->fpga_rw = config->fpga_rw;
 		ci_dbg_print("%s: Find Internal Structure!\n", __func__);
 	} else {
 		inter = kzalloc(sizeof(struct fpga_internal), GFP_KERNEL);
@@ -743,7 +744,6 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
 
 	ci_dbg_print("%s: setting state = %p for ci = %d\n", __func__,
 						state, ci_nr - 1);
-	inter->state[ci_nr - 1] = state;
 	state->internal = inter;
 	state->nr = ci_nr - 1;
 
@@ -765,6 +765,8 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
 	if (0 != ret)
 		goto err;
 
+       inter->state[ci_nr - 1] = state;
+
 	altera_hw_filt_init(config, ci_nr);
 
 	if (inter->strt_wrk) {