Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: atomisp: ov2722: Remove power on sensor from set_fmt() callback

The atomisp driver now properly ensures s_power(1) is called before calling
the set_fmt() callback, so this workaround is no longer necessary.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

authored by

Hans de Goede and committed by
Mauro Carvalho Chehab
36a14185 e03a5d3e

-13
-12
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
··· 528 528 return -ENODEV; 529 529 } 530 530 531 - if (dev->power_on == 1) 532 - return 0; /* Already on */ 533 - 534 531 /* power control */ 535 532 ret = power_ctrl(sd, 1); 536 533 if (ret) ··· 552 555 /* according to DS, 20ms is needed between PWDN and i2c access */ 553 556 msleep(20); 554 557 555 - dev->power_on = 1; 556 558 return 0; 557 559 558 560 fail_clk: ··· 575 579 return -ENODEV; 576 580 } 577 581 578 - if (dev->power_on == 0) 579 - return 0; /* Already off */ 580 - 581 582 ret = dev->platform_data->flisclk_ctrl(sd, 0); 582 583 if (ret) 583 584 dev_err(&client->dev, "flisclk failed\n"); ··· 592 599 if (ret) 593 600 dev_err(&client->dev, "vprog failed.\n"); 594 601 595 - dev->power_on = 0; 596 602 return ret; 597 603 } 598 604 ··· 668 676 } 669 677 670 678 mutex_lock(&dev->input_lock); 671 - 672 - /* s_power has not been called yet for std v4l2 clients (camorama) */ 673 - power_up(sd); 674 679 675 680 dev->pixels_per_line = dev->res->pixels_per_line; 676 681 dev->lines_per_frame = dev->res->lines_per_frame; ··· 967 978 return -ENOMEM; 968 979 969 980 mutex_init(&dev->input_lock); 970 - dev->power_on = -1; 971 981 972 982 dev->res = &ov2722_res_preview[0]; 973 983 v4l2_i2c_subdev_init(&dev->sd, client, &ov2722_ops);
-1
drivers/staging/media/atomisp/i2c/ov2722.h
··· 198 198 struct ov2722_resolution *res; 199 199 200 200 struct camera_sensor_platform_data *platform_data; 201 - int power_on; 202 201 u16 pixels_per_line; 203 202 u16 lines_per_frame; 204 203 u8 type;