diff options
Diffstat (limited to 'drivers/media/pci/ivtv')
| -rw-r--r-- | drivers/media/pci/ivtv/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-fileops.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/pci/ivtv/Kconfig b/drivers/media/pci/ivtv/Kconfig index 06ca4e23f9fb..e96b3c182a2f 100644 --- a/drivers/media/pci/ivtv/Kconfig +++ b/drivers/media/pci/ivtv/Kconfig @@ -18,7 +18,7 @@ config VIDEO_IVTV select VIDEO_VP27SMPX select VIDEO_UPD64031A select VIDEO_UPD64083 - ---help--- + help This is a video4linux driver for Conexant cx23416 or cx23415 based PCI personal video recorder devices. @@ -32,7 +32,7 @@ config VIDEO_IVTV_DEPRECATED_IOCTLS bool "enable the DVB ioctls abuse on ivtv driver" depends on VIDEO_IVTV default n - ---help--- + help Enable the usage of the a DVB set of ioctls that were abused by IVTV driver for a while. @@ -45,7 +45,7 @@ config VIDEO_IVTV_ALSA tristate "Conexant cx23415/cx23416 ALSA interface for PCM audio capture" depends on VIDEO_IVTV && SND select SND_PCM - ---help--- + help This driver provides an ALSA interface as another method for user applications to obtain PCM audio data from Conexant cx23415/cx23416 based PCI TV cards supported by the ivtv driver. @@ -63,7 +63,7 @@ config VIDEO_FB_IVTV select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT - ---help--- + help This is a framebuffer driver for the Conexant cx23415 MPEG encoder/decoder. @@ -77,7 +77,7 @@ config VIDEO_FB_IVTV_FORCE_PAT bool "force cx23415 framebuffer init with x86 PAT enabled" depends on VIDEO_FB_IVTV && X86_PAT default n - ---help--- + help With PAT enabled, the cx23415 framebuffer driver does not utilize write-combined caching on the framebuffer memory. For this reason, the driver will by default disable itself diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c index 6196daae4b3e..043ac0ae9ed0 100644 --- a/drivers/media/pci/ivtv/ivtv-fileops.c +++ b/drivers/media/pci/ivtv/ivtv-fileops.c @@ -420,7 +420,7 @@ static ssize_t ivtv_read_pos(struct ivtv_stream *s, char __user *ubuf, size_t co IVTV_DEBUG_HI_FILE("read %zd from %s, got %zd\n", count, s->name, rc); if (rc > 0) - pos += rc; + *pos += rc; return rc; } |