evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] smiapp: Prepare and unprepare clocks correctly

Browse source 
Prepare clocks before enabling and unprepare after disabling them.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Sakari Ailus 2013-08-10 14:49:47 -03:00 • committed by Mauro Carvalho Chehab
parent 367da7a318
commit d0aae0048a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/i2c/smiapp/smiapp-core.c
View file

@ -1122,9 +1122,9 @@ static int smiapp_power_on(struct smiapp_sensor *sensor)
rval = sensor->platform_data->set_xclk( rval = sensor->platform_data->set_xclk(
&sensor->src->sd, sensor->platform_data->ext_clk); &sensor->src->sd, sensor->platform_data->ext_clk);
else else
rval = clk_enable(sensor->ext_clk); rval = clk_prepare_enable(sensor->ext_clk);
if (rval < 0) { if (rval < 0) {
dev_dbg(&client->dev, "failed to set xclk\n"); dev_dbg(&client->dev, "failed to enable xclk\n");
goto out_xclk_fail; goto out_xclk_fail;
} }
usleep_range(1000, 1000); usleep_range(1000, 1000);
@ -1244,7 +1244,7 @@ out_cci_addr_fail:
if (sensor->platform_data->set_xclk) if (sensor->platform_data->set_xclk)
sensor->platform_data->set_xclk(&sensor->src->sd, 0); sensor->platform_data->set_xclk(&sensor->src->sd, 0);
else else
clk_disable(sensor->ext_clk); clk_disable_unprepare(sensor->ext_clk);
out_xclk_fail: out_xclk_fail:
regulator_disable(sensor->vana); regulator_disable(sensor->vana);
@ -1270,7 +1270,7 @@ static void smiapp_power_off(struct smiapp_sensor *sensor)
if (sensor->platform_data->set_xclk) if (sensor->platform_data->set_xclk)
sensor->platform_data->set_xclk(&sensor->src->sd, 0); sensor->platform_data->set_xclk(&sensor->src->sd, 0);
else else
clk_disable(sensor->ext_clk); clk_disable_unprepare(sensor->ext_clk);
usleep_range(5000, 5000); usleep_range(5000, 5000);
regulator_disable(sensor->vana); regulator_disable(sensor->vana);
sensor->streaming = 0; sensor->streaming = 0;
@ -2839,7 +2839,7 @@ static int smiapp_remove(struct i2c_client *client)
if (sensor->platform_data->set_xclk) if (sensor->platform_data->set_xclk)
sensor->platform_data->set_xclk(&sensor->src->sd, 0); sensor->platform_data->set_xclk(&sensor->src->sd, 0);
else else
clk_disable(sensor->ext_clk); clk_disable_unprepare(sensor->ext_clk);
sensor->power_count = 0; sensor->power_count = 0;
} }