mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 3e5851305b45a4dac66bd49529e511d1334a08fc Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dsteve@broadcom.com>
|
|
Date: Mon, 9 Dec 2013 11:05:24 +0000
|
|
Subject: [PATCH 133/196] V4L2: Fix issue of driver jamming if STREAMON failed.
|
|
|
|
Fix issue where the driver was left in a partially enabled
|
|
state if STREAMON failed, and would then reject many IOCTLs
|
|
as it thought it was streaming.
|
|
|
|
Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
|
|
---
|
|
drivers/media/platform/bcm2835/bcm2835-camera.c | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
|
|
index 47fe45d..2743074 100644
|
|
--- a/drivers/media/platform/bcm2835/bcm2835-camera.c
|
|
+++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
|
|
@@ -425,7 +425,15 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
|
|
vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
|
|
if (ret) {
|
|
v4l2_err(&dev->v4l2_dev,
|
|
- "Failed to enable capture port - error %d\n", ret);
|
|
+ "Failed to enable capture port - error %d. "
|
|
+ "Disabling camera port again\n", ret);
|
|
+
|
|
+ vchiq_mmal_port_disable(dev->instance,
|
|
+ dev->capture.camera_port);
|
|
+ if (disable_camera(dev) < 0) {
|
|
+ v4l2_err(&dev->v4l2_dev, "Failed to disable camera");
|
|
+ return -EINVAL;
|
|
+ }
|
|
return -1;
|
|
}
|
|
|
|
--
|
|
1.9.1
|
|
|