Skip to content

Commit 53fd070

Browse files
committed
staging: bcm2835-camera: Disable camera on error
If the encode tunnel failed to enable, then the camera was left enabled and that caused a failure on a subsequent request to change format. Disable the camera on failure. Signed-off-by: Dave Stevenson <[email protected]>
1 parent e59e2a6 commit 53fd070

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
554554
vchiq_mmal_port_return_buffers(dev->instance,
555555
dev->capture.port,
556556
flush_cb);
557-
return -1;
557+
disable_camera(dev);
558+
return -EINVAL;
558559
}
559560
}
560561

0 commit comments

Comments
 (0)