summaryrefslogtreecommitdiff
path: root/linux/drivers/media
AgeCommit message (Collapse)Author
2008-08-11merge: v4l-dvbJean-Francois Moine
2008-08-24v4l2-dev: do not clear the driver_data fieldHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The driver_data field of the device structure was zeroed, thus losing this information. Many drivers set this up before calling video_device_register, so we have to ensure that it isn't lost. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-24saa7115: call i2c_set_clientdata only when state != NULLHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Not a bug as such, but it looks really strange doing this before checking whether the state structure could be allocated. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-24wm8739: remove wrong kfreeHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> i2c_client is allocated for us, we should never free it ourselves. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Use the new video_drvdata(filp) function where it is safe to do so. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l2-dev: cleanups and add video_drvdata helper functionHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Cleanup v4l2-dev.[ch], add/improve comments and add a new helper function: video_drvdata() that can get the private driver data from a file struct. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l2: remove the priv field, use dev_get_drvdata insteadHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Remove the priv field and let video_get/set_drvdata use dev_get_drvdata and dev_set_drvdata instead. Convert all drivers that still used priv directly. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l2-dev: make the video_device's release callback mandatoryHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Now that all drivers set the release callback in the video_device struct we can put in a BUG_ON in video_register_device to ensure that the callback is always there. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l: add all missing video_device release callbacksHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> All drivers that call video_device_register where checked to see if they set the release callback of struct video_device. Where that callback was missing it was added. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l2-dev: add video_device_release_emptyHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add a second release function: video_device_release_empty It can be used by drivers that have statically allocated video_device structs. Its use usually, but not always, indicates laziness on the part of the driver programmer. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l2-dev: remove obsolete video_exclusive_open/releaseHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l: replace the last uses of video_exclusive_open/releaseHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Handle the video_exclusive_open/release functionality inside the driver. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23v4l: fix more incorrect video_register_device result checksHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23radio: fix incorrect video_register_device result checkHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-23radio: replace video_exclusive_open/releaseHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Move the video_exclusive_open/release functionality into the driver itself. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-09lgs8gl5: fix build warningsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Fix the following build warnings: lgs8gl5.c: In function 'lgs8gl5_read_reg': lgs8gl5.c:95: warning: unused variable 'j' lgs8gl5.c: In function 'lgs8gl5_update_alt_reg': lgs8gl5.c:135: warning: unused variable 'j' lgs8gl5.c: In function 'lgs8gl5_read_ber': lgs8gl5.c:300: warning: unused variable 'state' lgs8gl5.c: In function 'lgs8gl5_read_ucblocks': lgs8gl5.c:332: warning: unused variable 'state' lgs8gl5.c: At top level: lgs8gl5.c:181: warning: 'lgs8gl5_set_inversion' defined but not used Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-08-09cxusb: add lgs8gl5 and support for Magic-Pro DMB-TH usb stickMichael Krufky
From: Timothy Lee <timothy.lee@siriushk.com> Add support for Magic-Pro DMB-TH usb stick. DMB-TH is the HDTV broadcast standard used in Hong Kong and China. [...] I've also attached a second patch against the dvb-apps repository which adds a DMB-TH scan file for Hong Kong. Since the ProHDTV stick contains a DMB-TH decoder (lgs8gl5) onboard, it outputs MPEG-TS to the PC. Priority: normal Signed-off-by: Timothy Lee <timothy.lee@siriushk.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-08-09fix DVB_FE_CUSTOMISE for DVB_DIB7000P and DVB_TUNER_DIB0070 with dvb-usb-cxusbMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Allow dvb-usb-cxusb to be built without dib7000p or dib0070 selected Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-08-09cxusb: fix checkpatch warnings & errorsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Fix the following checkpatch.pl errors and warnings: ERROR: do not use assignment in if condition 117: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:819: + if ((adap->fe = dvb_attach(dib7000p_attach, ERROR: switch and case should be at the same indent 155: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:857: + switch (band) { + case BAND_VHF: offset = 950; break; + case BAND_UHF: + default: offset = 550; break; WARNING: line over 80 characters 169: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:871: + struct i2c_adapter *tun_i2c = dib7000p_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1); WARNING: line over 80 characters 213: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:1342: +static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = { WARNING: line over 80 characters 226: FILE: linux/drivers/media/dvb/dvb-usb/cxusb.c:1355: + .size_of_priv = sizeof(struct dib0700_adapter_state), total: 2 errors, 3 warnings, 266 lines checked Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Anton Blanchard <anton@samba.org>
2008-08-09cxusb: add support for DViCO FusionHDTV DVB-T Dual Digital 4 (rev 2)Michael Krufky
From: Anton Blanchard <anton@samba.org> Add support for revision 2 of the DViCO FusionHDTV DVB-T Dual Digital 4 which has new tuners and demodulators (2 x DIB7070p). With this patch both DVB reception and IR works. The dib7000p driver currently hardwires the output mode to OUTMODE_MPEG2_SERIAL regardless of what we ask for. Modify it to allow OUTMODE_MPEG2_PAR_GATED_CLK to be set. Longer term we should remove the check completely and set the output mode correctly in all the callers. Add Kconfig bits to ensure the dib7000p and dib0070 modules are enabled. It would be nice to only do this for the !DVB_FE_CUSTOMISE case, but this is what the other DIB7070 module does (there are a number of module dependencies in the attach code). Priority: normal Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-08-09v4l2: add AAC bitrate controlHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> If you can select AAC as audio encoder, then you should also be able to set the bitrate. Add this missing control. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-09ivtv: improve CC supportHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - change the work-queue to a single threaded high prio workqueue - use DMA instead of PIO for the sliced VBI data. - remove some incorrect tests - increase the internal VBI capture queue size for sliced VBI packets - ignore duplicate VBI lines With these changes it should finally be possible to get reliable closed captions. Priority: high Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-09merge: http://www.linuxtv.org/hg/~stoth/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-08-09V4L: fix return value of register video funcMauro Carvalho Chehab
From: Henrik Kretzschmar <henne@nachtwindheim.de> If a wrong device type is used with video_register_device_index() it should better return an error number, instead of a constant. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-08-21v4l2-ioctl.c: fix warningMauro Carvalho Chehab
From: Alexander Beregalov <a.beregalov@gmail.com> drivers/media/video/v4l2-ioctl.c:496: warning: format '%08ld' expects type 'long int', but argument 5 has type 'suseconds_t' Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-08-20saa7134-core.c: fix warningMauro Carvalho Chehab
From: Alexander Beregalov <a.beregalov@gmail.com> drivers/media/video/saa7134/saa7134-core.c:366: warning: 'saa7134_buffer_requeue' defined but not used Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-08-08arv: fix compilation errors/warningsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - add PCI dependency for btcx - fix compile errors (doesn't like ';' at the end of a #if 0) Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-08saa6752hs: add PMT table for AC3Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The PMT table for AC3 audio is different. Thanks to Dmitry Belimov for providing the table data. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-08saa6752hs: cleanup and add AC-3 supportHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Cleaned up the saa6752hs i2c driver. Add AC-3 support. Add VIDIOC_CHIP_IDENT support. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-08-08backport commit 5e246b850df563224be26f1d409cf66fd6c968dfMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Takashi Iwai <tiwai@suse.de> ALSA: Kill snd_assert() in other places Kill snd_assert() in other places, either removed or replaced with if () with snd_BUG_ON(). kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-09-08backport commit 87f3dd77974cba1ba0798abd741ede50f56b3eb3Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Eric Miao <eric.miao@marvell.com> [ARM] pxa: simplify DMA register definitions 1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and pass DRCMR index by "struct resource" if possible 2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-11cx88 Dvico FusionHDTV ProMauro Carvalho Chehab
From: Tim Farrington <timf@iinet.net.au> Well, one thing you encouraged me to do was re-test some of my cards which contained the xc3028-zarlink combo. Which led me to test a Dvico FusionHDTV Pro. Almost a year ago, Chris Pascoe did a patch for this which can be found at his ~pascoe/xc-test at Linuxtv. This worked very well, however that was using his version of firmware. Alas, someone attempted to use this and patch v4l-dvb, and messed it up. So I've fixed it. I enclose the patch against today's tree (containing your latest tuner-xc2028.c patch). The card now works very well, well with DVB-T anyway. Signed-off-by: Tim Farrington <timf@iinet.net.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-11merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-devMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-04cx18: Fix warning message for DMA done notification for inactive stream.Andy Walls
From: Andy Walls <awalls@radix.net> cx18: Fix warning message for DMA done notification for inactive stream. The warning message would always gripe that the radio stream was to blame, which was misleading and wrong (/dev/radioN nodes never transfer data). Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2008-10-04cx18: Add entries for the Leadtek PVR2100 and Toshiba Qosmio DVB-T/AnalogAndy Walls
From: Andy Walls <awalls@radix.net> cx18: Add entries for the Leadtek PVR2100 and Toshiba Qosmio DVB-T/Analog capture cards. Both cards are hybrids cards, but no digital capture functionality has been added yet. These entries are a first guess at the card entries to get analog working, given the information available. Terry Wu <terrywu at leadtek.com.tw> provided a pointer to information for the PVR2100. Martin Juhl <mj at casalogic.dk>, an owner of the Toshiba DVB-T/Analog tuner card, provided the DDR timing information from his Windows inf file. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2008-10-11merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-move-zoranMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-11merge: http://linuxtv.org/hg/~jfrancois/gspca/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-10security: avoid calling a NULL function pointer in drivers/video/tvaudio.cMauro Carvalho Chehab
From: Arjan van de Ven <arjan@linux.intel.com> NULL function pointers are very bad security wise. This one got caught by kerneloops.org quite a few times, so it's happening in the field.... Fix is simple, check the function pointer for NULL, like 6 other places in the same function are already doing. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-10USB: remove info() macro from usb media driversMauro Carvalho Chehab
From: Greg Kroah-Hartman <gregkh@suse.de> USB should not be having it's own printk macros, so remove info() and use the system-wide standard of dev_info() wherever possible. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> CC: Douglas Landgraf <dougsland@gmail.com> CC: Mike Isely <isely@pobox.com> CC: Thierry Merle <thierry.merle@free.fr> CC: Antoine Jacquet <royale@zerezo.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-11af9013/m5602: Fix compilation at in-kernelMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> This patch fixes a few errors that were breaking in-kernel compilation. The first one were at m5602 that were including "gspca.h" from another directory. A trivial change at m5602/Makefile fixed the issue. A harder to fix error were caused by the fact that both af9013 and m5602 were declaring an external var called 'debug'. If you compile both modules in-kernel, you'll have troubles. This is even worse, since there are two other drivers outside the subsystem with a similar mistake. To make things worse, gcc do a very great job of fooling the developers, by blaming the wrong lines anf files when such error occurs. So, I was having errors like: drivers/media/dvb/built-in.o: In function `dvb_usercopy': /home/v4l/tokernel/git/drivers/media/dvb/dvb-core/dvbdev.c:403: multiple definition of `debug' drivers/media/video/built-in.o:/home/v4l/tokernel/git/drivers/media/video/bt819.c:264: first defined here or: drivers/media/dvb/built-in.o: In function `dvb_usercopy': /home/v4l/tokernel/git/drivers/media/dvb/dvb-core/dvbdev.c:403: multiple definition of `debug' drivers/media/video/built-in.o:/home/v4l/tokernel/git/drivers/media/video/vpx3220.c:125: first defined here The two above errors caused by m5602 driver. After fixing m5602, I got this: drivers/built-in.o: In function `SiS_SetGroup2': /home/v4l/tokernel/git/drivers/video/sis/init301.c:6996: multiple definition of `debug' arch/x86/kernel/built-in.o:/home/v4l/tokernel/git/arch/x86/kernel/entry_32.S:810: first defined here This one caused by af9013. This patch fixes those erros by prefixing the debug vars with the name of the module, without changing the name of the parameter. Next time, please prepend all extern vars with the name of the module. To avoid bisect troubles, I've folded those changes with the original commits that added those modules at my -git tree. kernel-sync: CC: Jean-Francois Moine <moinejf@free.fr> CC: Antti Palosaari <crope@iki.fi> CC: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-10-09zoran: move zoran sources into a zoran subdirectoryHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Prevent the zoran driver sources from cluttering the video directory. This changeset only moves the drivers and it does not fix any of the checkpatch warnings/errors to keep the changeset clean. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-10-09merge: v4l-dvbJean-Francois Moine
2008-10-09gspca: Fix some compilation warnings in m5602.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-08gspca: Big rewrite of t613.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> - separate functions for bridge and sensor exchanges - delays added after some exchanges - other sensor type Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-07gspca: Bad name of the tv8532 subdriver in Kconfig.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: high Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-07gspca: Add some lost controls to the s5k83a sensor.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-06dib0700: fix bad assignment of dib0700_xc5000_tuner_callback after return callMichael Krufky
From: Devin Heitmueller <devin.heitmueller@gmail.com> Put callback definition before function return and cleanup callback: Fix a bug where the xc5000 callback was being set *after* the return call (essentially resulting in dead code). Also cleanup the callback function to detect unknown commands. Priority: normal Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-10-06gspca: Bad name of the sunplus subdriver in Kconfig.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: high Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-05gspca: Add the subdriver finepix in Kconfig and Makefile.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: high Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-10-05gspca: sd_desc->start returns a value and static functions in m5602.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: high Signed-off-by: Jean-Francois Moine <moinejf@free.fr>