diff options
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-firmware.c | 4 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtvfb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c index 4df01947a7df..14a1cea1d70d 100644 --- 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 | |||
179 | { | 179 | { |
180 | int i; | 180 | int i; |
181 | 181 | ||
182 | /* mailbox is preceeded by a 16 byte 'magic cookie' starting at a 256-byte | 182 | /* mailbox is preceded by a 16 byte 'magic cookie' starting at a 256-byte |
183 | address boundary */ | 183 | address boundary */ |
184 | for (i = 0; i < size; i += 0x100) { | 184 | for (i = 0; i < size; i += 0x100) { |
185 | if (readl(mem + i) == 0x12345678 && | 185 | if (readl(mem + i) == 0x12345678 && |
@@ -377,7 +377,7 @@ int ivtv_firmware_check(struct ivtv *itv, char *where) | |||
377 | "Reloading\n", where); | 377 | "Reloading\n", where); |
378 | res = ivtv_firmware_restart(itv); | 378 | res = ivtv_firmware_restart(itv); |
379 | /* | 379 | /* |
380 | * Even if restarted ok, still signal a problem had occured. | 380 | * Even if restarted ok, still signal a problem had occurred. |
381 | * The caller can come through this function again to check | 381 | * The caller can come through this function again to check |
382 | * if things are really ok after the restart. | 382 | * if things are really ok after the restart. |
383 | */ | 383 | */ |
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index f0316d02f09f..17247451c693 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
@@ -1080,7 +1080,7 @@ static int ivtvfb_init_vidmode(struct ivtv *itv) | |||
1080 | kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN); | 1080 | kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN); |
1081 | 1081 | ||
1082 | if (!oi->ivtvfb_info.pseudo_palette) { | 1082 | if (!oi->ivtvfb_info.pseudo_palette) { |
1083 | IVTVFB_ERR("abort, unable to alloc pseudo pallete\n"); | 1083 | IVTVFB_ERR("abort, unable to alloc pseudo palette\n"); |
1084 | return -ENOMEM; | 1084 | return -ENOMEM; |
1085 | } | 1085 | } |
1086 | 1086 | ||