diff options
-rw-r--r-- | drivers/media/video/videobuf-vmalloc.c | 2 | ||||
-rw-r--r-- | include/media/v4l2-dev.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c index a868b7ed75ff..be65a2fb3976 100644 --- a/drivers/media/video/videobuf-vmalloc.c +++ b/drivers/media/video/videobuf-vmalloc.c | |||
@@ -203,7 +203,7 @@ static int __videobuf_iolock (struct videobuf_queue* q, | |||
203 | return 0; | 203 | return 0; |
204 | 204 | ||
205 | /* FIXME: to properly support USERPTR, remap should occur. | 205 | /* FIXME: to properly support USERPTR, remap should occur. |
206 | The code bellow won't work, since mem->vma = NULL | 206 | The code below won't work, since mem->vma = NULL |
207 | */ | 207 | */ |
208 | /* Try to remap memory */ | 208 | /* Try to remap memory */ |
209 | rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0); | 209 | rc = remap_vmalloc_range(mem->vma, (void *)vb->baddr, 0); |
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 21419da44cb6..2745e1afc722 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -55,7 +55,7 @@ struct video_device | |||
55 | char name[32]; | 55 | char name[32]; |
56 | int vfl_type; | 56 | int vfl_type; |
57 | int minor; | 57 | int minor; |
58 | /* attribute to diferentiate multiple indexs on one physical device */ | 58 | /* attribute to differentiate multiple indices on one physical device */ |
59 | int index; | 59 | int index; |
60 | 60 | ||
61 | int debug; /* Activates debug level*/ | 61 | int debug; /* Activates debug level*/ |
@@ -78,7 +78,7 @@ struct video_device | |||
78 | void *priv; | 78 | void *priv; |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | /* for videodev.c intenal usage -- please don't touch */ | 81 | /* for videodev.c internal usage -- please don't touch */ |
82 | int users; /* video_exclusive_{open|close} ... */ | 82 | int users; /* video_exclusive_{open|close} ... */ |
83 | struct mutex lock; /* ... helper function uses these */ | 83 | struct mutex lock; /* ... helper function uses these */ |
84 | }; | 84 | }; |