aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/media-framework.txt
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 12:12:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 12:12:14 -0400
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /Documentation/media-framework.txt
parent6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff)
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'Documentation/media-framework.txt')
-rw-r--r--Documentation/media-framework.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt
index fd48add02cb0..76a2087db205 100644
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
@@ -194,7 +194,7 @@ each pad.
194 194
195Links are represented by a struct media_link instance, defined in 195Links are represented by a struct media_link instance, defined in
196include/media/media-entity.h. Each entity stores all links originating at or 196include/media/media-entity.h. Each entity stores all links originating at or
197targetting any of its pads in a links array. A given link is thus stored 197targeting any of its pads in a links array. A given link is thus stored
198twice, once in the source entity and once in the target entity. The array is 198twice, once in the source entity and once in the target entity. The array is
199pre-allocated and grows dynamically as needed. 199pre-allocated and grows dynamically as needed.
200 200
@@ -348,6 +348,6 @@ a streaming entity. Links that can be modified while streaming must be marked
348with the MEDIA_LNK_FL_DYNAMIC flag. 348with the MEDIA_LNK_FL_DYNAMIC flag.
349 349
350If other operations need to be disallowed on streaming entities (such as 350If other operations need to be disallowed on streaming entities (such as
351changing entities configuration parameters) drivers can explictly check the 351changing entities configuration parameters) drivers can explicitly check the
352media_entity stream_count field to find out if an entity is streaming. This 352media_entity stream_count field to find out if an entity is streaming. This
353operation must be done with the media_device graph_mutex held. 353operation must be done with the media_device graph_mutex held.