hc
2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84
kernel/drivers/media/spi/ms41908.c
....@@ -289,6 +289,7 @@
289289 }
290290 ext_dev->is_running = true;
291291 reinit_completion(&ext_dev->complete);
292
+ reinit_completion(&ext_dev->complete_out);
292293
293294 if (ext_dev->is_dir_opp) {
294295 if (pos > ext_dev->last_pos) {
....@@ -1239,7 +1240,6 @@
12391240 unsigned long ret = 0;
12401241
12411242 if (dev->is_running) {
1242
- reinit_completion(&dev->complete_out);
12431243 ret = wait_for_completion_timeout(&dev->complete_out, 10 * HZ);
12441244 if (ret == 0)
12451245 dev_info(&motor->spi->dev,
....@@ -2560,8 +2560,9 @@
25602560 (motor->piris->run_data.psum * 24);
25612561 motor->piris->is_running = false;
25622562 dev_info(&motor->spi->dev,
2563
- "piris vd_fz_period_us %u, inict %d\n",
2563
+ "piris vd_fz_period_us %u, psum %d, inict %d\n",
25642564 motor->vd_fz_period_us,
2565
+ motor->piris->run_data.psum,
25652566 motor->piris->run_data.intct);
25662567 }
25672568 if (motor->is_use_focus) {
....@@ -2580,8 +2581,9 @@
25802581 motor->focus->is_running = false;
25812582 motor->focus->reback_ctrl = false;
25822583 dev_info(&motor->spi->dev,
2583
- "focus vd_fz_period_us %u, inict %d\n",
2584
+ "focus vd_fz_period_us %u, psum %d, inict %d\n",
25842585 motor->vd_fz_period_us,
2586
+ motor->focus->run_data.psum,
25852587 motor->focus->run_data.intct);
25862588 if (motor->focus->reback != 0) {
25872589 motor->focus->cur_back_delay = 0;
....@@ -2619,7 +2621,6 @@
26192621 motor->zoom->mv_tim.vcm_end_t = ns_to_timeval(ktime_get_ns());
26202622 init_completion(&motor->zoom->complete);
26212623 init_completion(&motor->zoom->complete_out);
2622
- motor->vd_fz_period_us = VD_FZ_US;
26232624 motor->zoom->run_data.psum = motor->vd_fz_period_us *
26242625 motor->zoom->start_up_speed * 8 / 1000000;
26252626 motor->zoom->run_data.intct = 27 * motor->vd_fz_period_us /
....@@ -2653,8 +2654,9 @@
26532654 motor->zoom->reback_move_time_us = reback_vd_cnt * (motor->vd_fz_period_us + 500);
26542655 }
26552656 dev_info(&motor->spi->dev,
2656
- "zoom vd_fz_period_us %u, inict %d\n",
2657
+ "zoom vd_fz_period_us %u, psum %d, inict %d\n",
26572658 motor->vd_fz_period_us,
2659
+ motor->zoom->run_data.psum,
26582660 motor->zoom->run_data.intct);
26592661 }
26602662 if (motor->is_use_zoom1) {
....@@ -2666,7 +2668,6 @@
26662668 motor->zoom1->mv_tim.vcm_end_t = ns_to_timeval(ktime_get_ns());
26672669 init_completion(&motor->zoom1->complete);
26682670 init_completion(&motor->zoom1->complete_out);
2669
- motor->vd_fz_period_us = VD_FZ_US;
26702671 motor->zoom1->run_data.psum = motor->vd_fz_period_us *
26712672 motor->zoom1->start_up_speed * 8 / 1000000;
26722673 motor->zoom1->run_data.intct = 27 * motor->vd_fz_period_us /
....@@ -2674,8 +2675,9 @@
26742675 motor->zoom1->is_running = false;
26752676 motor->zoom1->reback_ctrl = false;
26762677 dev_info(&motor->spi->dev,
2677
- "zoom1 vd_fz_period_us %u, inict %d\n",
2678
+ "zoom1 vd_fz_period_us %u, psum %d, inict %d\n",
26782679 motor->vd_fz_period_us,
2680
+ motor->zoom1->run_data.psum,
26792681 motor->zoom1->run_data.intct);
26802682 }
26812683