git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7164
/
saa7164-cmd.c
diff --git
a/drivers/media/video/saa7164/saa7164-cmd.c
b/drivers/media/video/saa7164/saa7164-cmd.c
index
6a4c217
..
62fac7f
100644
(file)
--- a/
drivers/media/video/saa7164/saa7164-cmd.c
+++ b/
drivers/media/video/saa7164/saa7164-cmd.c
@@
-257,7
+257,7
@@
out:
}
/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if
}
/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if
- * the event never occured, or SAA_OK if it was signaled during the wait.
+ * the event never occur
r
ed, or SAA_OK if it was signaled during the wait.
*/
int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
{
*/
int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
{