Skip to content

Commit

Permalink
staging: bcm2835-camera: Remove check of the number of buffers supplied
Browse files Browse the repository at this point in the history
Before commit "staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping"
there was a need to ensure that there were sufficient buffers supplied from
the user to cover those being sent to the VPU (always 1).

Now the buffers are linked 1:1 between MMAL and V4L2,
therefore there is no need for that check, and indeed it is wrong
as there is no need to submit all the buffers before starting streaming.

Fixes: 9384167 ("staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping")
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dave Stevenson authored and Greg Kroah-Hartman committed Jul 1, 2019
1 parent 70ec64c commit bb8e970
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1338,16 +1338,6 @@ static int port_enable(struct vchiq_mmal_instance *instance,
if (port->enabled)
return 0;

/* ensure there are enough buffers queued to cover the buffer headers */
if (port->buffer_cb) {
hdr_count = 0;
list_for_each(buf_head, &port->buffers) {
hdr_count++;
}
if (hdr_count < port->current_buffer.num)
return -ENOSPC;
}

ret = port_action_port(instance, port,
MMAL_MSG_PORT_ACTION_TYPE_ENABLE);
if (ret)
Expand Down

0 comments on commit bb8e970

Please sign in to comment.