diff options
Diffstat (limited to 'drivers/media/video/saa7164')
-rw-r--r-- | drivers/media/video/saa7164/saa7164-cmd.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7164/saa7164-fw.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7164/saa7164-types.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c index 6a4c217ed3a7..62fac7f9d04e 100644 --- a/drivers/media/video/saa7164/saa7164-cmd.c +++ b/drivers/media/video/saa7164/saa7164-cmd.c | |||
@@ -257,7 +257,7 @@ out: | |||
257 | } | 257 | } |
258 | 258 | ||
259 | /* Wait for a signal event, without holding a mutex. Either return TIMEOUT if | 259 | /* Wait for a signal event, without holding a mutex. Either return TIMEOUT if |
260 | * the event never occured, or SAA_OK if it was signaled during the wait. | 260 | * the event never occurred, or SAA_OK if it was signaled during the wait. |
261 | */ | 261 | */ |
262 | int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) | 262 | int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) |
263 | { | 263 | { |
diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c index b369300cce06..a266bf0169e6 100644 --- a/drivers/media/video/saa7164/saa7164-fw.c +++ b/drivers/media/video/saa7164/saa7164-fw.c | |||
@@ -444,7 +444,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) | |||
444 | printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved); | 444 | printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved); |
445 | printk(KERN_INFO " .Version = 0x%x\n", hdr->version); | 445 | printk(KERN_INFO " .Version = 0x%x\n", hdr->version); |
446 | 446 | ||
447 | /* Retreive bootloader if reqd */ | 447 | /* Retrieve bootloader if reqd */ |
448 | if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0)) | 448 | if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0)) |
449 | /* Second bootloader in the firmware file */ | 449 | /* Second bootloader in the firmware file */ |
450 | filesize = hdr->reserved * 16; | 450 | filesize = hdr->reserved * 16; |
diff --git a/drivers/media/video/saa7164/saa7164-types.h b/drivers/media/video/saa7164/saa7164-types.h index df1d2997fa6c..1d2140a3eb38 100644 --- a/drivers/media/video/saa7164/saa7164-types.h +++ b/drivers/media/video/saa7164/saa7164-types.h | |||
@@ -412,7 +412,7 @@ struct tmComResVBIFormatDescrHeader { | |||
412 | u8 StartLine; /* NTSC Start = 10 */ | 412 | u8 StartLine; /* NTSC Start = 10 */ |
413 | u8 EndLine; /* NTSC = 21 */ | 413 | u8 EndLine; /* NTSC = 21 */ |
414 | u8 FieldRate; /* 60 for NTSC */ | 414 | u8 FieldRate; /* 60 for NTSC */ |
415 | u8 bNumLines; /* Unsed - scheduled for removal */ | 415 | u8 bNumLines; /* Unused - scheduled for removal */ |
416 | } __attribute__((packed)); | 416 | } __attribute__((packed)); |
417 | 417 | ||
418 | struct tmComResProbeCommit { | 418 | struct tmComResProbeCommit { |