Commit 4b83a7a7 authored by Anton Nurkin's avatar Anton Nurkin Committed by Mauro Carvalho Chehab

[media] cx23885: fix pointer to structure for CAM

Fixes problem with CAM, when  after re-iinitialization
CAM used old pointer to structure.
Signed-off-by: default avatarAnton Nurkin <ptqa@netup.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0a23dc24
...@@ -724,6 +724,7 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr) ...@@ -724,6 +724,7 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
if (temp_int != NULL) { if (temp_int != NULL) {
inter = temp_int->internal; inter = temp_int->internal;
(inter->cis_used)++; (inter->cis_used)++;
inter->fpga_rw = config->fpga_rw;
ci_dbg_print("%s: Find Internal Structure!\n", __func__); ci_dbg_print("%s: Find Internal Structure!\n", __func__);
} else { } else {
inter = kzalloc(sizeof(struct fpga_internal), GFP_KERNEL); inter = kzalloc(sizeof(struct fpga_internal), GFP_KERNEL);
...@@ -743,7 +744,6 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr) ...@@ -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__, ci_dbg_print("%s: setting state = %p for ci = %d\n", __func__,
state, ci_nr - 1); state, ci_nr - 1);
inter->state[ci_nr - 1] = state;
state->internal = inter; state->internal = inter;
state->nr = ci_nr - 1; state->nr = ci_nr - 1;
...@@ -765,6 +765,8 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr) ...@@ -765,6 +765,8 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
if (0 != ret) if (0 != ret)
goto err; goto err;
inter->state[ci_nr - 1] = state;
altera_hw_filt_init(config, ci_nr); altera_hw_filt_init(config, ci_nr);
if (inter->strt_wrk) { if (inter->strt_wrk) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment