summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Ospite <ao2@amarulasolutions.com>2013-01-28 21:45:31 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-08 16:27:13 +0100
commitc240ac9bc7470d4d060df3688b8e590cbbab9eb5 (patch)
tree63862cdc11ec296015856d13cf42035f67fa4eb2
parent[media] staging/media/solo6x10: Use PTR_RET rather than if(IS_ERR(...)) + PTR... (diff)
downloadlinux-c240ac9bc7470d4d060df3688b8e590cbbab9eb5.tar.xz
linux-c240ac9bc7470d4d060df3688b8e590cbbab9eb5.zip
[media] Documentation/media-framework.txt: fix a sentence
Signed-off-by: Antonio Ospite <ao2@amarulasolutions.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/media-framework.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt
index 802875413873..77bd0a42f19d 100644
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
@@ -336,7 +336,7 @@ Calls to media_entity_pipeline_start() can be nested. The pipeline pointer must
be identical for all nested calls to the function.
media_entity_pipeline_start() may return an error. In that case, it will
-clean up any the changes it did by itself.
+clean up any of the changes it did by itself.
When stopping the stream, drivers must notify the entities with