diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-03-07 20:20:23 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-08 10:04:24 -0500 |
commit | be787ace0139bc7ef0229606819bad64bb5d84f4 (patch) | |
tree | dcb22cb64038969b5e4b6d394b019e4c5862bd13 /drivers/media/video | |
parent | 91ae3299d7d3493a25e5f26cbaceeb18e7760ef3 (diff) |
V4L/DVB (3413): Typos grab bag of the month
Typos grab bag of the month.
Eyeballed by jmc@ in OpenBSD.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cpia.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videocodec.h | 2 | ||||
-rw-r--r-- | drivers/media/video/zr36050.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zr36060.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zr36120_i2c.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index c2405029a720..d93a561e6b80 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
@@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file, | |||
3369 | //DBG("cpia_ioctl: %u\n", ioctlnr); | 3369 | //DBG("cpia_ioctl: %u\n", ioctlnr); |
3370 | 3370 | ||
3371 | switch (ioctlnr) { | 3371 | switch (ioctlnr) { |
3372 | /* query capabilites */ | 3372 | /* query capabilities */ |
3373 | case VIDIOCGCAP: | 3373 | case VIDIOCGCAP: |
3374 | { | 3374 | { |
3375 | struct video_capability *b = arg; | 3375 | struct video_capability *b = arg; |
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 589283d5ddd1..08f8be345fa8 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -1628,7 +1628,7 @@ static int cpia2_do_ioctl(struct inode *inode, struct file *file, | |||
1628 | } | 1628 | } |
1629 | 1629 | ||
1630 | switch (ioctl_nr) { | 1630 | switch (ioctl_nr) { |
1631 | case VIDIOCGCAP: /* query capabilites */ | 1631 | case VIDIOCGCAP: /* query capabilities */ |
1632 | retval = ioctl_cap_query(arg, cam); | 1632 | retval = ioctl_cap_query(arg, cam); |
1633 | break; | 1633 | break; |
1634 | 1634 | ||
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/videocodec.h index 156ae57096fe..b1239ac7f371 100644 --- a/drivers/media/video/videocodec.h +++ b/drivers/media/video/videocodec.h | |||
@@ -56,7 +56,7 @@ | |||
56 | the slave is bound to it). Otherwise it doesn't need this functions and | 56 | the slave is bound to it). Otherwise it doesn't need this functions and |
57 | therfor they may not be initialized. | 57 | therfor they may not be initialized. |
58 | 58 | ||
59 | The other fuctions are just for convenience, as they are for shure used by | 59 | The other fuctions are just for convenience, as they are for sure used by |
60 | most/all of the codecs. The last ones may be ommited, too. | 60 | most/all of the codecs. The last ones may be ommited, too. |
61 | 61 | ||
62 | See the structure declaration below for more information and which data has | 62 | See the structure declaration below for more information and which data has |
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c index bd0cd28543ca..6699725be605 100644 --- a/drivers/media/video/zr36050.c +++ b/drivers/media/video/zr36050.c | |||
@@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr) | |||
159 | 159 | ||
160 | while (!(zr36050_read_status1(ptr) & 0x4)) { | 160 | while (!(zr36050_read_status1(ptr) & 0x4)) { |
161 | udelay(1); | 161 | udelay(1); |
162 | if (i++ > 200000) { // 200ms, there is for shure something wrong!!! | 162 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! |
163 | dprintk(1, | 163 | dprintk(1, |
164 | "%s: timout at wait_end (last status: 0x%02x)\n", | 164 | "%s: timout at wait_end (last status: 0x%02x)\n", |
165 | ptr->name, ptr->status1); | 165 | ptr->name, ptr->status1); |
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c index 28fa31a5f150..d8dd003a7aad 100644 --- a/drivers/media/video/zr36060.c +++ b/drivers/media/video/zr36060.c | |||
@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr) | |||
161 | 161 | ||
162 | while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) { | 162 | while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) { |
163 | udelay(1); | 163 | udelay(1); |
164 | if (i++ > 200000) { // 200ms, there is for shure something wrong!!! | 164 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! |
165 | dprintk(1, | 165 | dprintk(1, |
166 | "%s: timout at wait_end (last status: 0x%02x)\n", | 166 | "%s: timout at wait_end (last status: 0x%02x)\n", |
167 | ptr->name, ptr->status); | 167 | ptr->name, ptr->status); |
diff --git a/drivers/media/video/zr36120_i2c.c b/drivers/media/video/zr36120_i2c.c index 6bfe84d657f1..21fde43a6aed 100644 --- a/drivers/media/video/zr36120_i2c.c +++ b/drivers/media/video/zr36120_i2c.c | |||
@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id) | |||
65 | case I2C_DRIVERID_VIDEODECODER: | 65 | case I2C_DRIVERID_VIDEODECODER: |
66 | DEBUG(printk(CARD_INFO "decoder attached\n",CARD)); | 66 | DEBUG(printk(CARD_INFO "decoder attached\n",CARD)); |
67 | 67 | ||
68 | /* fetch the capabilites of the decoder */ | 68 | /* fetch the capabilities of the decoder */ |
69 | rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc); | 69 | rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc); |
70 | if (rv) { | 70 | if (rv) { |
71 | DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD)); | 71 | DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD)); |