dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

V4L/DVB (12532): soc-camera: Use camera device object for core output

Browse source 
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2009-08-25 11:47:00 -03:00 committed by Mauro Carvalho Chehab
parent 85f8be6812
commit 2aa58db47f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/video/soc_camera.c
View file

@ -297,7 +297,7 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf,
return ret;
} else if (!icd->current_fmt ||
icd->current_fmt->fourcc != pix->pixelformat) {
dev_err(ici->v4l2_dev.dev,
dev_err(&icd->dev,
"Host driver hasn't set up current format correctly!\n");
return -EINVAL;
}
@ -426,7 +426,6 @@ static int soc_camera_close(struct file *file)
struct soc_camera_file *icf = file->private_data;
struct soc_camera_device *icd = icf->icd;
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
struct video_device *vdev = icd->vdev;
mutex_lock(&icd->video_lock);
icd->use_count--;
@ -446,7 +445,7 @@ static int soc_camera_close(struct file *file)
vfree(icf);
dev_dbg(vdev->parent, "camera device close\n");
dev_dbg(&icd->dev, "camera device close\n");
return 0;
}
@ -456,10 +455,9 @@ static ssize_t soc_camera_read(struct file *file, char __user *buf,
{
struct soc_camera_file *icf = file->private_data;
struct soc_camera_device *icd = icf->icd;
struct video_device *vdev = icd->vdev;
int err = -EINVAL;
dev_err(vdev->parent, "camera device read not implemented\n");
dev_err(&icd->dev, "camera device read not implemented\n");
return err;
}