diff options
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r-- | drivers/media/video/soc_camera.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 86e0648f65a0..27921162514c 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -385,12 +385,6 @@ static int soc_camera_open(struct file *file) | |||
385 | goto eiciadd; | 385 | goto eiciadd; |
386 | } | 386 | } |
387 | 387 | ||
388 | if (icd->ops->init) { | ||
389 | ret = icd->ops->init(icd); | ||
390 | if (ret < 0) | ||
391 | goto einit; | ||
392 | } | ||
393 | |||
394 | /* Try to configure with default parameters */ | 388 | /* Try to configure with default parameters */ |
395 | ret = soc_camera_set_fmt(icf, &f); | 389 | ret = soc_camera_set_fmt(icf, &f); |
396 | if (ret < 0) | 390 | if (ret < 0) |
@@ -411,9 +405,6 @@ static int soc_camera_open(struct file *file) | |||
411 | * and use_count == 1 | 405 | * and use_count == 1 |
412 | */ | 406 | */ |
413 | esfmt: | 407 | esfmt: |
414 | if (icd->ops->release) | ||
415 | icd->ops->release(icd); | ||
416 | einit: | ||
417 | ici->ops->remove(icd); | 408 | ici->ops->remove(icd); |
418 | eiciadd: | 409 | eiciadd: |
419 | if (icl->power) | 410 | if (icl->power) |
@@ -438,8 +429,6 @@ static int soc_camera_close(struct file *file) | |||
438 | if (!icd->use_count) { | 429 | if (!icd->use_count) { |
439 | struct soc_camera_link *icl = to_soc_camera_link(icd); | 430 | struct soc_camera_link *icl = to_soc_camera_link(icd); |
440 | 431 | ||
441 | if (icd->ops->release) | ||
442 | icd->ops->release(icd); | ||
443 | ici->ops->remove(icd); | 432 | ici->ops->remove(icd); |
444 | if (icl->power) | 433 | if (icl->power) |
445 | icl->power(icd->pdev, 0); | 434 | icl->power(icd->pdev, 0); |