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 d8bf2b0..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;
 
-       /* mailbox is preceeded 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 &&
@@ -248,9 +248,9 @@ void ivtv_init_mpeg_decoder(struct ivtv *itv)
        volatile u8 __iomem *mem_offset;
 
        data[0] = 0;
-       data[1] = itv->params.width;    /* YUV source width */
-       data[2] = itv->params.height;
-       data[3] = itv->params.audio_properties; /* Audio settings to use,
+       data[1] = itv->cxhdl.width;     /* YUV source width */
+       data[2] = itv->cxhdl.height;
+       data[3] = itv->cxhdl.audio_properties;  /* Audio settings to use,
                                                           bitmap. see docs. */
        if (ivtv_api(itv, CX2341X_DEC_SET_DECODER_SOURCE, 4, data)) {
                IVTV_ERR("ivtv_init_mpeg_decoder failed to set decoder source\n");
@@ -377,7 +377,7 @@ int ivtv_firmware_check(struct ivtv *itv, char *where)
                          "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 occurred.
                 * The caller can come through this function again to check
                 * if things are really ok after the restart.
                 */