mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 06:02:38 +00:00
[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: Anton Nurkin <ptqa@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
0a23dc24cd
commit
4b83a7a753
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user