Skip to content

Commit

Permalink
[media] staging: Fix comments and some typos in staging/media/*
Browse files Browse the repository at this point in the history
linux-next:
I like to spend some time reading code, in doing so I have found some
typos in some of the comments.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Justin P. Mattock authored and Mauro Carvalho Chehab committed Mar 19, 2012
1 parent abfac0b commit b47acf2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/media/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ menuconfig STAGING_MEDIA
don't have the "normal" Linux kernel quality level.
Most of them don't follow properly the V4L, DVB and/or RC API's,
so, they won't likely work fine with the existing applications.
That also means that, one fixed, their API's will change to match
That also means that, once fixed, their API's will change to match
the existing ones.

If you wish to work on these drivers, to help improve them, or
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/media/as102/as102_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <linux/uaccess.h>
#include <linux/usb.h>

/* header file for Usb device driver*/
/* header file for usb device driver*/
#include "as102_drv.h"
#include "as102_fw.h"
#include "dvbdev.h"
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/media/as102/as102_fe.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ int as102_dvb_register_fe(struct as102_dev_t *as102_dev,
strncpy(dvb_fe->ops.info.name, as102_dev->name,
sizeof(dvb_fe->ops.info.name));

/* register dbvb frontend */
/* register dvb frontend */
errno = dvb_register_frontend(dvb_adap, dvb_fe);
if (errno == 0)
dvb_fe->tuner_priv = as102_dev;
Expand All @@ -349,7 +349,7 @@ static void as10x_fe_copy_tps_parameters(struct dtv_frontend_properties *fe_tps,
struct as10x_tps *as10x_tps)
{

/* extract consteallation */
/* extract constellation */
switch (as10x_tps->modulation) {
case CONST_QPSK:
fe_tps->modulation = QPSK;
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/media/go7007/go7007-v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1050,15 +1050,15 @@ static int vidioc_s_parm(struct file *filp, void *priv,
return 0;
}

/* VIDIOC_ENUMSTD on go7007 were used for enumberating the supported fps and
/* VIDIOC_ENUMSTD on go7007 were used for enumerating the supported fps and
its resolution, when the device is not connected to TV.
This were an API abuse, probably used by the lack of specific IOCTL's to
enumberate it, by the time the driver were written.
This is were an API abuse, probably used by the lack of specific IOCTL's to
enumerate it, by the time the driver was written.
However, since kernel 2.6.19, two new ioctls (VIDIOC_ENUM_FRAMEINTERVALS
and VIDIOC_ENUM_FRAMESIZES) were added for this purpose.
The two functions bellow implements the newer ioctls
The two functions below implement the newer ioctls
*/
static int vidioc_enum_framesizes(struct file *filp, void *priv,
struct v4l2_frmsizeenum *fsize)
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/media/lirc/lirc_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ MODULE_PARM_DESC(iommap, "physical base for memory mapped I/O"
/*
* some architectures (e.g. intel xscale) align the 8bit serial registers
* on 32bit word boundaries.
* See linux-kernel/serial/8250.c serial_in()/out()
* See linux-kernel/drivers/tty/serial/8250/8250.c serial_in()/out()
*/
module_param(ioshift, int, S_IRUGO);
MODULE_PARM_DESC(ioshift, "shift I/O register offset (0 = no shift)");
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/media/solo6x10/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ config SOLO6X10
select SND_PCM
---help---
This driver supports the Softlogic based MPEG-4 and h.264 codec
codec cards.
cards.

0 comments on commit b47acf2

Please sign in to comment.