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

[media] s3c-camif: Remove redundant NULL check

Browse source 
clk_unprepare checks for NULL pointer. Hence convert IS_ERR_OR_NULL
to IS_ERR only.
[s.nawrocki: added initialisation of the clock array to ERR_PTR() value]

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sachin Kamat 2013-04-30 02:16:18 -03:00 • committed by Mauro Carvalho Chehab
parent 24f99dd0fb
commit d46a5a68b1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/platform/s3c-camif/camif-core.c
View file

@ -341,10 +341,11 @@ static void camif_clk_put(struct camif_dev *camif)
int i; int i;
for (i = 0; i < CLK_MAX_NUM; i++) { for (i = 0; i < CLK_MAX_NUM; i++) {
if (IS_ERR_OR_NULL(camif->clock[i])) if (IS_ERR(camif->clock[i]))
continue; continue;
clk_unprepare(camif->clock[i]); clk_unprepare(camif->clock[i]);
clk_put(camif->clock[i]); clk_put(camif->clock[i]);
camif->clock[i] = ERR_PTR(-EINVAL);
} }
} }
@ -352,6 +353,9 @@ static int camif_clk_get(struct camif_dev *camif)
{ {
int ret, i; int ret, i;
for (i = 1; i < CLK_MAX_NUM; i++)
camif->clock[i] = ERR_PTR(-EINVAL);
for (i = 0; i < CLK_MAX_NUM; i++) { for (i = 0; i < CLK_MAX_NUM; i++) {
camif->clock[i] = clk_get(camif->dev, camif_clocks[i]); camif->clock[i] = clk_get(camif->dev, camif_clocks[i]);
if (IS_ERR(camif->clock[i])) { if (IS_ERR(camif->clock[i])) {