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 branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
ivtv
/
ivtv-firmware.c
diff --git
a/drivers/media/video/ivtv/ivtv-firmware.c
b/drivers/media/video/ivtv/ivtv-firmware.c
index
4df0194
..
14a1cea
100644
(file)
--- a/
drivers/media/video/ivtv/ivtv-firmware.c
+++ b/
drivers/media/video/ivtv/ivtv-firmware.c
@@
-179,7
+179,7
@@
static volatile struct ivtv_mailbox __iomem *ivtv_search_mailbox(const volatile
{
int i;
{
int i;
- /* mailbox is prece
e
ded by a 16 byte 'magic cookie' starting at a 256-byte
+ /* mailbox is preceded by a 16 byte 'magic cookie' starting at a 256-byte
address boundary */
for (i = 0; i < size; i += 0x100) {
if (readl(mem + i) == 0x12345678 &&
address boundary */
for (i = 0; i < size; i += 0x100) {
if (readl(mem + i) == 0x12345678 &&
@@
-377,7
+377,7
@@
int ivtv_firmware_check(struct ivtv *itv, char *where)
"Reloading\n", where);
res = ivtv_firmware_restart(itv);
/*
"Reloading\n", where);
res = ivtv_firmware_restart(itv);
/*
- * Even if restarted ok, still signal a problem had occured.
+ * Even if restarted ok, still signal a problem had occur
r
ed.
* The caller can come through this function again to check
* if things are really ok after the restart.
*/
* The caller can come through this function again to check
* if things are really ok after the restart.
*/