summaryrefslogtreecommitdiff
path: root/linux
AgeCommit message (Collapse)Author
2009-07-23gspca - sn9c20x: Misc fixes.Jean-Francois Moine
From: Brian Johnson <brijohn@gmail.com> * use i2c_w instead of reg_w * return error on failure * read the correct number of bytes Priority: normal Signed-off-by: Brian Johnson <brijohn@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-07-22ivtv: Fix improper GPIO audio mux input switch on video standard changeAndy Walls
From: Andy Walls <awalls@radix.net> Remove the subdev_s_std() method from the GPIO subdev. It appears it was used in the past to effect the switch back from radio mode to tuner mode, but it had a side effect that is improper and against the V4L2 spec, when you were not in radio mode. Whenever the video stanadrd was changed, the GPIO audio mux was set back to the tuner audio input, even if you were set to a Line In input. Thanks to Ravi A. for doing the troubleshooting to point me right to the problem. Reported-by: Ravi A <asvravi@gmail.com> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-07-22ivtv: Fix errors in AVerTV M113 card definitions and add a new M113 cardAndy Walls
From: Andy Walls <awalls@radix.net> Priority: normal Tested-by: Ravi A. <asvravi@gmail.com> Signed-off-by: Andy Walls <awalls@radix.net>
2009-07-22tuner-simple: Add an entry for the Partsnic PTI-5NF05 NTSC tunerAndy Walls
From: Andy Walls <awalls@radix.net> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-07-22Create card parameters array in SDMC DM1105 driver.Igor M. Liplianin
From: Igor M. Liplianin <liplianin@me.by> Create card parameters array in SDMC DM1105 driver. It is useful for cards with the same pci id, but different tuners, lnb power control circuits, etc. Signed-off-by: Igor M. Liplianin <liplianin@me.by>
2009-07-22pxa_camera: Fix Oops in pxa_camera_probe.Guennadi Liakhovetski
From: Antonio Ospite <ospite@studenti.unina.it> mclk_get_divisor uses pcdev->soc_host.dev, make sure it is initialized. Priority: high Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/pxa_camera.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
2009-07-22zr364xx: error message when buffer is too small and code cleanupAntoine Jacquet
From: Lamarque Vieira Souza <lamarque@gmail.com> . added code to print an error message when buffer is too small to hold frame data, that is better than just a hard crash. Tested using MAX_FRAME_SIZE = 50000, lots of error messages appeared in /var/log/messages but no crash. . removed line "f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;" in zr364xx_vidioc_try_fmt_vid_cap, it should not be there. . changes to improve performance (or at least not hurt it): removed some unneeded debug messages; added macro FULL_DEBUG to enable debug messages in performance critical places, this macro is disabled by default; removed "if (frm->lpvbits == NULL)..." in zr364xx_read_video_callback because after analisying the source code I concluded it will always results to false, so it is not needed. . some small code reorganization. Signed-off-by: Lamarque V. Souza <lamarque@gmail.com> Signed-off-by: Antoine Jacquet <royale@zerezo.com>
2009-07-21backport commit 405f55712dfe464b3240d7816cc4fe4174831be2Mauro Carvalho Chehab
kernel-sync: Author: Alexey Dobriyan <adobriyan@gmail.com> Date: Sat Jul 11 22:08:37 2009 +0400 headers: smp_lock.h redux * Remove smp_lock.h from files which don't need it (including some headers!) * Add smp_lock.h to files which do need it * Make smp_lock.h include conditional in hardirq.h It's needed only for one kernel_locked() usage which is under CONFIG_PREEMPT This will make hardirq.h inclusion cheaper for every PREEMPT=n config (which includes allmodconfig/allyesconfig, BTW) Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-21zr364xx: Need to include linux/version.hMauro Carvalho Chehab
drivers/media/video/zr364xx.c: In function ‘zr364xx_vidioc_querycap’: drivers/media/video/zr364xx.c:736: error: implicit declaration of function ‘KERNEL_VERSION’ kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-21flexcop: fix compile errorHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-07-20merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-rdsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20merge: http://udev.netup.ru/hg/v4l-dvb-commitsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20merge: http://www.kernellabs.com/hg/~stoth/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-bttvMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-miscMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20merge: http://linuxtv.org/hg/~tap/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20Implement changing resolution on the fly for zr364xx driverAntoine Jacquet
From: Lamarque Vieira Souza <lamarque@gmail.com> This patch implements changing resolution in zr364xx_vidioc_s_fmt_vid_cap for zr364xx driver. This version is synced with v4l-dvb as of 20/Jul/2009. Tested with Creative PC-CAM 880. OBS: I had to increase MAX_FRAME_SIZE to prevent a hard crash in my notebook (caps lock blinking) when testing with mplayer, which automatically sets resolution to the maximum (640x480). Maybe we should add code to auto-detect frame size to prevent this kind of crash in the future. Signed-off-by: Lamarque V. Souza <lamarque@gmail.com> Signed-off-by: Antoine Jacquet <royale@zerezo.com>
2009-07-20cx23885: Modify hardware revision detection for newer siliconSteven Toth
From: Steven Toth <stoth@kernellabs.com> cx23885: Modify hardware revision detection for newer silicon Priority: normal Signed-off-by: Steven Toth <stoth@kernellabs.com>
2009-07-20cx23885: Add support for ATSC/QAM on Hauppauge HVR-1850Steven Toth
From: Steven Toth <stoth@kernellabs.com> cx23885: Add support for ATSC/QAM on Hauppauge HVR-1850 Priority: normal Signed-off-by: Steven Toth <stoth@kernellabs.com>
2009-07-20Add CAM presence checkout during CiMax init for NetUP card.Igor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> CAM presence checkout is needed after power on PC. Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-07-20cx23885-417: fix manipulation of tvnormsMichael Krufky
From: Michael Krufky <mkrufky@kernellabs.com> Currently, the VIDIOC_S_STD ioctl just returns -EINVAL regardless of the norm passed. This patch sets cx23885_mpeg_template.tvnorms and cx23885_mpeg_template.current_norm so that the VIDIOC_S_STD will work. Thanks to Joseph Yasi for pointing this out, even though this particular fix was already pushed into a development repository, merge priority of this changeset has been escalated as a result of Joseph posting this identical patch. Priority: high Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Joseph A. Yasi <joe.yasi@gmail.com> Reviewed-by: Steven Toth <stoth@kernellabs.com>
2009-07-20mt312: fix build for kernels < 2.6.24Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add compat.h include to get the KERN_CONT define needed for older kernels. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-07-20bttv: fix regression: tvaudio must be loaded before tunerHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Both tvaudio and the tuner share i2c address 0x42. The tvaudio module can check whether it really is a tda9840, but the tuner can't. So the tvaudio module must be loaded before the tuner module. This was also the case for 2.6.29, but the order was swapped in 2.6.30. Thanks to Krzysztof Grygiencz for reporting and testing this. Priority: high Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-07-20uvcvideo: Don't apply the FIX_BANDWIDTH quirk to all ViMicro devicesLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Commit 50144aeeb702ea105697ae5249f059ea3990b838 broke the Samsung NC10 netbook webcam. Instead of applying the FIX_BANDWIDTH quirk to all ViMicro devices, list the devices explicitly. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-07-19uvcvideo: Add PROBE_DEF quirk and enable it for the MT6227 deviceLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> At least one MT6227 model crashes when receiving a GET_DEF request on the video probe control. As the various models can't be told apart based on the descriptors, add a PROBE_DEF quirk to avoid sending the GET_DEF request and enable the quirk for all models. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-07-20stv6110 tuner: Read registers through one time i2c_transfer calling.Igor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-07-20Bug fix: stv0900 i2c repeater configuration must be set to manual.Abylay Ospan
From: Abylay Ospan <aospan@netup.ru> In automatic mode every stop event on SDA line ends repetition. However, in NetUP Dual card on the same i2c bus we have several devices. If someone using both adapters to lock simultaneously or working with CAM interface during lock procedure, it lead to end repetition prematurely quite often. Set stv0900 i2c repeater to manual mode prevents such situation. Signed-off-by: Abylay Ospan <aospan@netup.ru>
2009-07-20Change clocking configuration and frequency for NetUP card.Abylay Ospan
From: Abylay Ospan <aospan@netup.ru> Signed-off-by: Abylay Ospan <aospan@netup.ru>
2009-07-19sn9c20x: backport to work since 2.6.18Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Make sn9c20x driver to work with RHEL5 kernel. Yet, the event interface needs a little more work. Since I'm lazy, I've backported just the webcam driver. While here, reorder includes to the order used on other drivers. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20stv6110 tuner: remove unused iq_wiring configuration parameter.Igor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-07-19merge: http://linuxtv.org/hg/~jfrancois/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-19merge: http://linuxtv.org/hg/~ajacquet/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-20Add output clock configuration for stv6110 tuner.Igor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-07-19merge: http://linuxtv.org/hg/~obi/dmx-add-pidMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-19em28xx-video: better implement ac97 control ioctlsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> In the past, some devices with saa711x had their parameters controlled directly inside em28xx driver, instead of using their proper module for it. Due to that, the ac97 controls were mixed with saa711x ones. Older patches removed all saa711x controls, but we still need to control ac97 devices on em28xx, since we don't have a separate v4l2 device for it. The proper way to address is to create a separate ac97 v4l2 device. While we don't have it, we should clean up the code to allow having a better view of what is part of em28xx core code and what's due to ac97 control inside it. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-19em28xx-video: rename ac97 audio controls to better document itMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> As em28xx chip has nothing to do with volume/mute controls, rename those controls to properly indicate that they control the companion AC97 chip that it is inside the boards with this chip. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-19gspca - jpeg subdrivers: Check the result of kmalloc(jpeg header).Jean-Francois Moine
From: Julia Lawall <julia@diku.dk> Priority: high Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-07-19gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.Jean-Francois Moine
From: Brian Johnson <brijohn@gmail.com> Priority: high Signed-off-by: Brian Johnson <brijohn@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-07-19gspca - main: Support for vidioc_g_chip_ident and vidioc_g/s_register.Jean-Francois Moine
From: Brian Johnson <brijohn@gmail.com> Priority: high Signed-off-by: Brian Johnson <brijohn@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-07-15zr364xx: implement V4L2_CAP_STREAMINGAntoine Jacquet
From: Lamarque Vieira Souza <lamarque@gmail.com> This patch implements V4L2_CAP_STREAMING for the zr364xx driver, by converting the driver to use videobuf. This version is synced with v4l-dvb as of 15/Jul/2009. Tested with Creative PC-CAM 880. It basically: . implements V4L2_CAP_STREAMING using videobuf; . re-implements V4L2_CAP_READWRITE using videobuf; . copies cam->udev->product to the card field of the v4l2_capability struct. That gives more information to the users about the webcam; . moves the brightness setting code from before requesting a frame (in read_frame) to the vidioc_s_ctrl ioctl. This way the brightness code is executed only when the application requests a change in brightness and not before every frame read; . comments part of zr364xx_vidioc_try_fmt_vid_cap that says that Skype + libv4l do not work. This patch fixes zr364xx for applications such as mplayer, Kopete+libv4l and Skype+libv4l can make use of the webcam that comes with zr364xx chip. Signed-off-by: Lamarque V. Souza <lamarque@gmail.com> Signed-off-by: Antoine Jacquet <royale@zerezo.com>
2009-07-15merge: http://linuxtv.org/hg/~anttip/af9013/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-15merge: http://linuxtv.org/hg/~jfrancois/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-15merge: http://kernellabs.com/hg/~dheitmueller/hvr-900-tuning-fixMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-15merge: http://kernellabs.com/hg/~dheitmueller/pinnacle_hybrid_2881Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-15merge: http://kernellabs.com/hg/~dheitmueller/terratec-xs-mt352Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-14em28xx: set demod profile for Pinnacle Hybrid Pro 320eDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> The Pinnacle Hybrid Pro 320e was missing a demod config for the xc3028, which is required for digital tuning to work properly. Add the missing profile. Thanks to Andreas Lunderhage for testing patches and providing a remote debug environment. Priority: normal Cc: Andreas Lunderhage <lunderhage@home.se> Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-07-14em28xx: Make sure the tuner is initialized if generic empia USB id was usedDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> In cases where the device has a generic Empia USB ID, the call in the precard setup phase did not set the tuner GPIO. As a result, the tuner may not be taken out of reset before attempting initialization in the analog driver. This problem was not seen before with the EVGA inDtube, since that particular board has the analog GPIO setup to include taking the tuner out of reset. Thanks to Andreas Lunderhage for testing patches and providing a remote debug environment for the Pinnacle 320e. Priority: normal Cc: Andreas Lunderhage <lunderhage@home.se> Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-07-14merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-vpfe-capMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-14em28xx: add support for mt9m001 webcamsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Thanks to Wally <wally@voosen.eu> for bringing the issue and helping with the tests. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-07-15Remove a useless check from dvb_dmx_swfilter_packet()Andreas Oberritter
From: Andreas Oberritter <obi@linuxtv.org> Values for 'pid' range from 0 to 0x1fff. Therefore 'feed->pid' can never be equal to both 'pid' and 0x2000. This makes the continue statement have no effect. Priority: normal Signed-off-by: Andreas Oberritter <obi@linuxtv.org>