diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 15:17:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 15:17:53 -0700 |
| commit | 805bf3daf361a501594f8b27b394a8d7372ebe3c (patch) | |
| tree | c71fe689115c7fa0f270d31fcef75fe61d81318c /drivers/media/platform/soc_camera/soc_camera.c | |
| parent | tty: Reset itty for other pty (diff) | |
| parent | Linux 3.10-rc7 (diff) | |
| download | linux-dev-805bf3daf361a501594f8b27b394a8d7372ebe3c.tar.xz linux-dev-805bf3daf361a501594f8b27b394a8d7372ebe3c.zip | |
Merge 3.10-rc7 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/platform/soc_camera/soc_camera.c')
| -rw-r--r-- | drivers/media/platform/soc_camera/soc_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index eea832c5fd01..3a4efbdc7668 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/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) |