From 20fc256cdf079ceda5b75c8d66bce655e0e88174 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 10 Jun 2011 12:23:30 -0300
Subject: [PATCH] --- yaml --- r: 285391 b: refs/heads/master c:
 a597fa78d374c57dcf9a9bac02472a530cd7e60a h: refs/heads/master i:   285389:
 63b6eec9128675f156f7d9354451d7e9b85b64f7   285387:
 eb95ee5be50e741ab6b3ad86311d4e13523757b9   285383:
 7168f13c9288eea2cc15aecf5614bafcd4cb1eff   285375:
 fb871ff4c707ada7f96f738622e38cc45e569574 v: v3

---
 [refs]                                             |  2 +-
 trunk/Documentation/DocBook/media/v4l/controls.xml | 10 ++++++++++
 trunk/include/linux/videodev2.h                    |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9ce96a15e432..42b2cc865ad9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa5034c667c224be48db31a0d043dba305e8e7a8
+refs/heads/master: a597fa78d374c57dcf9a9bac02472a530cd7e60a
diff --git a/trunk/Documentation/DocBook/media/v4l/controls.xml b/trunk/Documentation/DocBook/media/v4l/controls.xml
index 9e72f077329a..c0422c622337 100644
--- a/trunk/Documentation/DocBook/media/v4l/controls.xml
+++ b/trunk/Documentation/DocBook/media/v4l/controls.xml
@@ -3329,6 +3329,16 @@ interface and may change in the future.</para>
 		  <entry>The short circuit protection of the flash
 		  controller has been triggered.</entry>
 		</row>
+		<row>
+		  <entry><constant>V4L2_FLASH_FAULT_OVER_CURRENT</constant></entry>
+		  <entry>Current in the LED power supply has exceeded the limit
+		  specific to the flash controller.</entry>
+		</row>
+		<row>
+		  <entry><constant>V4L2_FLASH_FAULT_INDICATOR</constant></entry>
+		  <entry>The flash controller has detected a short or open
+		  circuit condition on the indicator LED.</entry>
+		</row>
 	      </tbody>
 	    </entrytbl>
 	  </row>
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index 4b752d5ee80e..3d62631839bc 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -1682,6 +1682,8 @@ enum v4l2_flash_strobe_source {
 #define V4L2_FLASH_FAULT_TIMEOUT		(1 << 1)
 #define V4L2_FLASH_FAULT_OVER_TEMPERATURE	(1 << 2)
 #define V4L2_FLASH_FAULT_SHORT_CIRCUIT		(1 << 3)
+#define V4L2_FLASH_FAULT_OVER_CURRENT		(1 << 4)
+#define V4L2_FLASH_FAULT_INDICATOR		(1 << 5)
 
 #define V4L2_CID_FLASH_CHARGE			(V4L2_CID_FLASH_CLASS_BASE + 11)
 #define V4L2_CID_FLASH_READY			(V4L2_CID_FLASH_CLASS_BASE + 12)