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]>
raspberrypi · Dec 13, 2021 · 53fd070 · 53fd070
1 parent e59e2a6
commit 53fd070
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -554,7 +554,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
 			vchiq_mmal_port_return_buffers(dev->instance,
 						       dev->capture.port,
 						       flush_cb);
-			return -1;
+			disable_camera(dev);
+			return -EINVAL;
 		}
 	}