From 76fb7aff8d8494f3c70ed03184273336ceed7ab0 Mon Sep 17 00:00:00 2001 From: Wenbing Wang Date: Wed, 5 Jun 2013 06:37:14 -0300 Subject: [PATCH] --- yaml --- r: 377204 b: refs/heads/master c: af44ad5edd1eb6ca92ed5be48e0004e1f04bf219 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/soc_camera/soc_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e06f054621f0..9be4e334a63f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 697a6d2387692c7f9c94f3bfb3dac474aa840f02 +refs/heads/master: af44ad5edd1eb6ca92ed5be48e0004e1f04bf219 diff --git a/trunk/drivers/media/platform/soc_camera/soc_camera.c b/trunk/drivers/media/platform/soc_camera/soc_camera.c index eea832c5fd01..3a4efbdc7668 100644 --- a/trunk/drivers/media/platform/soc_camera/soc_camera.c +++ b/trunk/drivers/media/platform/soc_camera/soc_camera.c @@ -643,9 +643,9 @@ static int soc_camera_close(struct file *file) if (ici->ops->init_videobuf2) vb2_queue_release(&icd->vb2_vidq); - ici->ops->remove(icd); - __soc_camera_power_off(icd); + + ici->ops->remove(icd); } if (icd->streamer == file)