diff options
Diffstat (limited to 'drivers/media/video/sh_mobile_ceu_camera.c')
-rw-r--r-- | drivers/media/video/sh_mobile_ceu_camera.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 39211628d427..cbc997d591bf 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c | |||
@@ -1726,7 +1726,7 @@ static int sh_mobile_ceu_try_fmt(struct soc_camera_device *icd, | |||
1726 | return ret; | 1726 | return ret; |
1727 | } | 1727 | } |
1728 | 1728 | ||
1729 | static int sh_mobile_ceu_reqbufs(struct soc_camera_file *icf, | 1729 | static int sh_mobile_ceu_reqbufs(struct soc_camera_device *icd, |
1730 | struct v4l2_requestbuffers *p) | 1730 | struct v4l2_requestbuffers *p) |
1731 | { | 1731 | { |
1732 | int i; | 1732 | int i; |
@@ -1740,7 +1740,7 @@ static int sh_mobile_ceu_reqbufs(struct soc_camera_file *icf, | |||
1740 | for (i = 0; i < p->count; i++) { | 1740 | for (i = 0; i < p->count; i++) { |
1741 | struct sh_mobile_ceu_buffer *buf; | 1741 | struct sh_mobile_ceu_buffer *buf; |
1742 | 1742 | ||
1743 | buf = container_of(icf->vb_vidq.bufs[i], | 1743 | buf = container_of(icd->vb_vidq.bufs[i], |
1744 | struct sh_mobile_ceu_buffer, vb); | 1744 | struct sh_mobile_ceu_buffer, vb); |
1745 | INIT_LIST_HEAD(&buf->vb.queue); | 1745 | INIT_LIST_HEAD(&buf->vb.queue); |
1746 | } | 1746 | } |
@@ -1750,10 +1750,10 @@ static int sh_mobile_ceu_reqbufs(struct soc_camera_file *icf, | |||
1750 | 1750 | ||
1751 | static unsigned int sh_mobile_ceu_poll(struct file *file, poll_table *pt) | 1751 | static unsigned int sh_mobile_ceu_poll(struct file *file, poll_table *pt) |
1752 | { | 1752 | { |
1753 | struct soc_camera_file *icf = file->private_data; | 1753 | struct soc_camera_device *icd = file->private_data; |
1754 | struct sh_mobile_ceu_buffer *buf; | 1754 | struct sh_mobile_ceu_buffer *buf; |
1755 | 1755 | ||
1756 | buf = list_entry(icf->vb_vidq.stream.next, | 1756 | buf = list_entry(icd->vb_vidq.stream.next, |
1757 | struct sh_mobile_ceu_buffer, vb.stream); | 1757 | struct sh_mobile_ceu_buffer, vb.stream); |
1758 | 1758 | ||
1759 | poll_wait(file, &buf->vb.done, pt); | 1759 | poll_wait(file, &buf->vb.done, pt); |