#include <linux/io.h>
#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
#include "omap24xxcam.h"
{
int i;
- mutex_lock(&vbq->lock);
+ mutex_lock(&vbq->vb_lock);
for (i = 0; i < VIDEO_MAX_FRAME; i++) {
if (NULL == vbq->bufs[i])
vbq->bufs[i] = NULL;
}
- mutex_unlock(&vbq->lock);
+ mutex_unlock(&vbq->vb_lock);
videobuf_mmap_free(vbq);
}
struct omap24xxcam_fh *fh =
container_of(vbq, struct omap24xxcam_fh, vbq);
- mutex_lock(&vbq->lock);
+ mutex_lock(&vbq->vb_lock);
for (i = 0; i < count; i++) {
err = omap24xxcam_vbq_alloc_mmap_buffer(vbq->bufs[i]);
videobuf_to_dma(vbq->bufs[i])->sglen, i);
}
- mutex_unlock(&vbq->lock);
+ mutex_unlock(&vbq->vb_lock);
return 0;
out:
omap24xxcam_vbq_free_mmap_buffer(vbq->bufs[i]);
}
- mutex_unlock(&vbq->lock);
+ mutex_unlock(&vbq->vb_lock);
return err;
}
mutex_unlock(&cam->mutex);
if (!rval) {
- mutex_lock(&ofh->vbq.lock);
+ mutex_lock(&ofh->vbq.vb_lock);
ofh->pix = f->fmt.pix;
- mutex_unlock(&ofh->vbq.lock);
+ mutex_unlock(&ofh->vbq.vb_lock);
}
memset(f, 0, sizeof(*f));
}
mutex_unlock(&cam->mutex);
- mutex_lock(&fh->vbq.lock);
+ mutex_lock(&fh->vbq.vb_lock);
if (list_empty(&fh->vbq.stream)) {
- mutex_unlock(&fh->vbq.lock);
+ mutex_unlock(&fh->vbq.vb_lock);
return POLLERR;
}
vb = list_entry(fh->vbq.stream.next, struct videobuf_buffer, stream);
- mutex_unlock(&fh->vbq.lock);
+ mutex_unlock(&fh->vbq.vb_lock);
poll_wait(file, &vb->done, wait);
return -EBUSY;
}
mutex_unlock(&cam->mutex);
- mutex_lock(&vbq->lock);
+ mutex_lock(&vbq->vb_lock);
/* look for first buffer to map */
for (first = 0; first < VIDEO_MAX_FRAME; first++) {
}
out:
- mutex_unlock(&vbq->lock);
+ mutex_unlock(&vbq->vb_lock);
return err;
}
spin_lock_init(&fh->vbq_lock);
- videobuf_queue_pci_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL,
+ videobuf_queue_sg_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL,
&fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
V4L2_FIELD_NONE,
sizeof(struct videobuf_buffer), fh);
}
static struct file_operations omap24xxcam_fops = {
- .owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = video_ioctl2,
.poll = omap24xxcam_poll,