diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /Documentation/media-framework.txt | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (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.txt | 4 |
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 | ||
195 | Links are represented by a struct media_link instance, defined in | 195 | Links are represented by a struct media_link instance, defined in |
196 | include/media/media-entity.h. Each entity stores all links originating at or | 196 | include/media/media-entity.h. Each entity stores all links originating at or |
197 | targetting any of its pads in a links array. A given link is thus stored | 197 | targeting any of its pads in a links array. A given link is thus stored |
198 | twice, once in the source entity and once in the target entity. The array is | 198 | twice, once in the source entity and once in the target entity. The array is |
199 | pre-allocated and grows dynamically as needed. | 199 | pre-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 | |||
348 | with the MEDIA_LNK_FL_DYNAMIC flag. | 348 | with the MEDIA_LNK_FL_DYNAMIC flag. |
349 | 349 | ||
350 | If other operations need to be disallowed on streaming entities (such as | 350 | If other operations need to be disallowed on streaming entities (such as |
351 | changing entities configuration parameters) drivers can explictly check the | 351 | changing entities configuration parameters) drivers can explicitly check the |
352 | media_entity stream_count field to find out if an entity is streaming. This | 352 | media_entity stream_count field to find out if an entity is streaming. This |
353 | operation must be done with the media_device graph_mutex held. | 353 | operation must be done with the media_device graph_mutex held. |