git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
mx3_camera.c
diff --git
a/drivers/media/video/mx3_camera.c
b/drivers/media/video/mx3_camera.c
index
a9be14c
..
29c5fc3
100644
(file)
--- a/
drivers/media/video/mx3_camera.c
+++ b/
drivers/media/video/mx3_camera.c
@@
-185,7
+185,7
@@
static void free_buffer(struct videobuf_queue *vq, struct mx3_camera_buffer *buf
* This waits until this buffer is out of danger, i.e., until it is no
* longer in STATE_QUEUED or STATE_ACTIVE
*/
* This waits until this buffer is out of danger, i.e., until it is no
* longer in STATE_QUEUED or STATE_ACTIVE
*/
- videobuf_waiton(vb, 0, 0);
+ videobuf_waiton(v
q, v
b, 0, 0);
if (txd) {
ichan = to_idmac_chan(txd->chan);
async_tx_ack(txd);
if (txd) {
ichan = to_idmac_chan(txd->chan);
async_tx_ack(txd);
@@
-441,7
+441,8
@@
static void mx3_camera_init_videobuf(struct videobuf_queue *q,
&mx3_cam->lock,
V4L2_BUF_TYPE_VIDEO_CAPTURE,
V4L2_FIELD_NONE,
&mx3_cam->lock,
V4L2_BUF_TYPE_VIDEO_CAPTURE,
V4L2_FIELD_NONE,
- sizeof(struct mx3_camera_buffer), icd);
+ sizeof(struct mx3_camera_buffer), icd,
+ NULL);
}
/* First part of ipu_csi_init_interface() */
}
/* First part of ipu_csi_init_interface() */
@@
-976,7
+977,7
@@
static int mx3_camera_try_fmt(struct soc_camera_device *icd,
return ret;
}
return ret;
}
-static int mx3_camera_reqbufs(struct soc_camera_
file *icf
,
+static int mx3_camera_reqbufs(struct soc_camera_
device *icd
,
struct v4l2_requestbuffers *p)
{
return 0;
struct v4l2_requestbuffers *p)
{
return 0;
@@
-984,9
+985,9
@@
static int mx3_camera_reqbufs(struct soc_camera_file *icf,
static unsigned int mx3_camera_poll(struct file *file, poll_table *pt)
{
static unsigned int mx3_camera_poll(struct file *file, poll_table *pt)
{
- struct soc_camera_
file *icf
= file->private_data;
+ struct soc_camera_
device *icd
= file->private_data;
- return videobuf_poll_stream(file, &ic
f
->vb_vidq, pt);
+ return videobuf_poll_stream(file, &ic
d
->vb_vidq, pt);
}
static int mx3_camera_querycap(struct soc_camera_host *ici,
}
static int mx3_camera_querycap(struct soc_camera_host *ici,