aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-19V4L/DVB: tm6000: bugfix image positionStefan Ringel1-2/+2
bugfix incorrect image and line position in videobuffer Signed-off-by: Stefan Ringel <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSETJarod Wilson1-6/+6
On Tue, May 04, 2010 at 06:06:41PM +0200, Dan Carpenter wrote: > On Tue, May 04, 2010 at 10:03:18AM -0400, Jarod Wilson wrote: > > @@ -1205,7 +1204,7 @@ static u32 imon_panel_key_lookup(u64 hw_code) > > if (imon_panel_key_table[i].hw_code == (code | 0xffee)) > > break; > > > > - keycode = imon_panel_key_table[i % IMON_KEY_RELEASE_OFFSET].keycode; > > + keycode = imon_panel_key_table[i].keycode; > > > > return keycode; > > } > > There is still potentially a problem here because if we don't hit the > break statement, then we're one past the end of the array. D'oh. Okay, here's v2, should fix that buglet too. This hack was used when the imon driver was using internal key lookup routines, but became dead weight when the driver was converted to use ir-core's key lookup routines. These bits simply didn't get removed, drop 'em now. Pointed out by Dan Carpenter. v2: fix possible attempt to access beyond end of key table array, also pointed out by Dan. Signed-off-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: tm6000: README - add vbiStefan Ringel1-0/+1
Signed-off-by: Stefan Ringel <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: Fix unlock logic at medusa_video_initMauro Carvalho Chehab1-32/+21
As reported by Dan Carpenter: > This was my patch: "cx25821: fix double unlock in medusa_video_init()" > > It accidentally got merged two times. The version from the staging tree > is not correct. Please can you revert it: > 7a02f549fcc30fe6be0c0024beae9a3db22e1af6 "Staging: cx25821: fix double > unlock in medusa_video_init()" After reviewing the logic at the function, instead of just adding a patch to revert the wrong one, the better is to apply a different logic: add a goto that will always unlock and return the error. This simplifies the code a little bit, and, instead of just return -EINVAL, it will return the error condition reported by the called functions. This patch is folded with another patch from Dan that added one missing goto. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: fix dvb frontend lockupmatthieu castet1-8/+17
If my dvb device is removed while in use, I got the following oops: [ 4920.484084] Call Trace: [ 4920.484102] [<c102daad>] ? default_wake_function+0x0/0x8 [ 4920.484147] [<f8cb09e1>] ? dvb_unregister_frontend+0x95/0xcc [dvb_core] [ 4920.484157] [<c1044412>] ? autoremove_wake_function+0x0/0x2d [ 4920.484168] [<f8dd1af2>] ? dvb_usb_adapter_frontend_exit+0x12/0x21 [dvb_usb] [ 4920.484176] [<f8dd12f1>] ? dvb_usb_exit+0x26/0x88 [dvb_usb] [ 4920.484184] [<f8dd138d>] ? dvb_usb_device_exit+0x3a/0x4a [dvb_usb] [ 4920.484217] [<f7fe1b08>] ? usb_unbind_interface+0x3f/0xb4 [usbcore] [ 4920.484227] [<c11a4178>] ? __device_release_driver+0x74/0xb7 [ 4920.484233] [<c11a4247>] ? device_release_driver+0x15/0x1e [ 4920.484243] [<c11a3a33>] ? bus_remove_device+0x6e/0x87 [ 4920.484249] [<c11a26d6>] ? device_del+0xfa/0x152 [ 4920.484264] [<f7fdf609>] ? usb_disable_device+0x59/0xb9 [usbcore] [ 4920.484279] [<f7fdb9ee>] ? usb_disconnect+0x70/0xdc [usbcore] [ 4920.484294] [<f7fdc728>] ? hub_thread+0x521/0xe1d [usbcore] [ 4920.484301] [<c1044412>] ? autoremove_wake_function+0x0/0x2d [ 4920.484316] [<f7fdc207>] ? hub_thread+0x0/0xe1d [usbcore] [ 4920.484321] [<c10441e0>] ? kthread+0x61/0x66 [ 4920.484327] [<c104417f>] ? kthread+0x0/0x66 [ 4920.484336] [<c1003d47>] ? kernel_thread_helper+0x7/0x10 If there are users (for example users == -2) : - dvb_unregister_frontend : - stop kernel thread with dvb_frontend_stop : - fepriv->exit = 1; - thread loop catch stop event and break while loop - fepriv->thread = NULL; and fepriv->exit = 0; - dvb_unregister_frontend wait on "fepriv->dvbdev->wait_queue" that fepriv->dvbdev->users==-1. The user finish : - dvb_frontend_release - set users to -1 - don't wait wait_queue because fepriv->exit != 1 => dvb_unregister_frontend never exit the wait queue. Signed-off-by: Matthieu CASTET <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: s2255drv: remove dead codeDan Carpenter1-4/+1
My concern initially was we dereference "dev" in the parameter list to s2255_dev_err() but it turns out that code path is never used. The s2255_stop_readpipe() is only called from one place and "dev" is never null. So this patch just removes the whole condition here. Signed-off-by: Dan Carpenter <[email protected]> Cc: [email protected] Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: s2255drv: return if vdev not foundDan Carpenter1-1/+5
The original code didn't handle the case where vdev was not found so I added a check for that. Signed-off-by: Dan Carpenter <[email protected]> Cc: [email protected] Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ov511: cleanup: remove unneeded null checkDan Carpenter1-1/+1
We dereference "ov" unconditionally throughout the function so there is no way it can be NULL here. This code has been around for ages so if it were possible for "ov" to be NULL someone would have complained. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/mem2mem: dereferencing free memoryDan Carpenter1-1/+3
We dereferenced "ctx" on the error path. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/IR: Add missing include file to rc-map.cPeter Huewe1-0/+1
This patch adds a missing include linux/delay.h to prevent build failures[1-5] Signed-off-by: Peter Huewe <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: dvb/stv6110x: cleanup error handlingDan Carpenter1-7/+3
The "stv6110x" is NULL so we can just return directly without calling kfree(). Also I changed the printk() to make checkpatch.pl happy. Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Manu Abraham <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to KconfigDevin Heitmueller1-0/+2
Add the demod and tuner dependencies required for the Avermedia m780 to the Kconfig for the ngene driver. Thanks to Oliver Endriss for pointing this out. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ngene: start separating out DVB functions into separate fileDevin Heitmueller4-129/+192
Start moving the dvb specific code to ngene-dvb.c. Note that there is still stuff in ngene-core.c which could potentially be moved out, but it will require considerable reworking of the logic in order to continue to properly support DVB while also being able to support transport streams coming from analog MPEG encoders. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ngene: split out card specific code into a separate fileDevin Heitmueller4-303/+337
Split out the card profiles into a new file called ngene-cards.c. This is part of a larger refactoring of the driver in preparation for adding analog support. Note that this patch makes *no* functional change - all I did was cut/paste the code and add the function prototypes to ngene.h as needed. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ngene: split out i2c code into a separate fileDevin Heitmueller4-135/+190
Split out the i2c related code from the ngene-core.c into a new file called ngene-i2c.c. This is part of a larger refactoring of the driver in preparation for adding analog support. Note that this patch makes *no* functional change - all I did was cut/paste the code and add the function prototypes to ngene.h as needed. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ngene: add initial support for digital side of Avermedia m780Devin Heitmueller1-1/+51
Add ATSC/QAM support for the Avermedia m780. Note that this patch does not include any analog support for the board, as the ngene bridge driver does not yet have analog implemented Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ngene: properly support boards where channel 0 isn't a TS inputDevin Heitmueller2-2/+6
The current code assumes that channel zero is always a TS input, which would result in an oops if the "one_adapter" modprobe option is 1 (which it is by default) and the board in question has something else on channel zero (which is the case for the Avermedia m780, which has it's analog input wired to UVI1) The code now explicitly tracks the first adapter created and ensures that other channels cannot accidentially be associated with a NULL adapter. Also, eliminate what appears to be a typo where all of the channel parameters are getting associated with stream zero's properties, which will work if you happen to have a dual stream board with the exact same configuration, but if they differ then the second stream is going to end up with the first stream's configuration. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L-DVB: ngene: make sure that tuner headers are includedMauro Carvalho Chehab1-1/+1
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/az6027: handle -EIO failureDan Carpenter1-4/+1
If the az6027_usb_in_op() returns a negative errno ret is -EIO and in that case the value of b[0] may be undefined. The original code assigned 0 to ret, but since it's already 0 now we can skip that. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/az6027: doing dma on the stackDan Carpenter1-9/+41
I changed the dma buffers to use allocated memory instead of stack memory. The reason for this is documented in Documentation/DMA-API-HOWTO.txt under the section: "What memory is DMA'able?" That document was only added a couple weeks ago and there are still lots of modules which haven't been corrected yet. Btw. Smatch includes a pretty good test to find places which use stack memory as a dma buffer. That's how I found these. (http://smatch.sf.net). Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/IR/imon: potential double unlock on errorDan Carpenter1-1/+0
If there is an error here we should unlock in the caller (which is imon_init_intf1()). We can remove this stray unlock. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/IR/imon: testing the wrong variableDan Carpenter1-1/+1
There is a typo here. We meant to test "ir" instead of "props". The "props" variable was tested earlier. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: media/IR/imon: precendence issue: ! vs ==Dan Carpenter1-1/+1
The original condition is always false because ! has higher precedence than == and neither 0 nor 1 is equal to IMON_DISPLAY_TYPE_VGA. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: tvp7002.c: fix some copy-paste errors in the commentsMats Randgaard1-11/+11
Signed-off-by: Mats Randgaard <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: tvp7002.c: Add support for enum_dv_presetsMats Randgaard1-0/+18
Implement enum_dv_presets in tvp7002. Signed-off-by: Mats Randgaard <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: v4l2-subdev.h: Add support for enum_dv_presetMats Randgaard1-0/+2
The op enum_dv_preset was missing in this header but is needed by subdev drivers with DV functionality. Signed-off-by: Mats Randgaard <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: gspca - sn9c20x: Fix non working mt9v111 sensorBrian Johnson1-25/+7
Signed-off-by: Brian Johnson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: gspca - sn9c20x: HAS_BUTTON flag -> HAS_NO_BUTTON flagBrian Johnson1-8/+8
Reverse HAS_BUTTON logic since most webcams either have a button or if they don't don't bother to send any interrupts. However I have at least one model that appears to leave the button GPIO floating and can send a bogus interrupt. Signed-off-by: Brian Johnson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: gspca - sn9c20x: Add another MSI laptop to upsidedown device listBrian Johnson1-0/+7
Signed-off-by: Brian Johnson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: gspca - sn9c20x: Add another laptop to upsidedown device listBrian Johnson1-0/+7
Signed-off-by: Brian Johnson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ivtv: fix VIDIOC_S_PRIORITY handlingHans Verkuil1-0/+1
VIDIOC_S_PRIORITY is also part of the ioctls that need to check the access priority. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: usbvision: add delay before detecting the saa711xHans Verkuil1-0/+3
The detection of the saa711x often failed. Adding a small delay before attempting to detect it fixed this. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: usbvision: don't use usb_set_intfdata, let v4l2_device_register ↵Hans Verkuil2-4/+6
handle this v4l2_device_register already sets intfdata, no need to do this again. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: hdpvr: fix disconnect sequenceHans Verkuil3-28/+28
Disconnecting the HDPVR caused a kernel oops if lockdep was enabled. In addition, if an app still had video0 open and attempted to call ioctl when the device was already disconnected the system would crash. Move the freeing and cleanup code to the release function: that is the right place for it since you know when you get there that nobody is using the device. Also removed usb_set_intfdata: v4l2_device_register sets this already to v4l2_dev. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: radio-am800: let v4l2_device_(un)register handle usb_get/set_intfdataHans Verkuil1-10/+9
v4l2_device_register already sets the usb intfdata to v4l2_dev. So use that instead. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bitHans Verkuil1-2/+0
No need to lock when unregistering the device: clear_bit is already an atomic operation. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: em28xx: g_tuner must set type fieldHans Verkuil1-0/+1
The 'type' field was undefined but should be set to ANALOG_TV. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: tvp7002: fix query_dv_presetHans Verkuil1-8/+5
If no signal or valid format is detected, then VIDIOC_QUERY_DV_PRESET must return 0 and set the preset to V4L2_DV_INVALID. This driver returned an error instead. Also simplified the kernel messages a bit: change v4l2_err to v4l2_dbg (not detecting a signal/valid format is not an error, so only print this info when debug == 1) and do not call v4l_fill_dv_preset_info: it's overkill to do this just for a debug message. Thanks to Mats Randgaard for bringing this to my attention. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: v4l2-common: simplify prio utility functionsHans Verkuil27-99/+94
v4l2_prio_init/open/close returned an int when in fact they would always return 0. Make these void functions. v4l2_prio_close and v4l2_prio_check pass an enum v4l2_priority as a pointer for no good reason. Replace with a normal enum v4l2_priority argument. These changes will simplify the work of moving priority handling into the v4l core. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: bttv: remove bogus prio check in g_frequencyHans Verkuil1-5/+0
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: Documentation: fix small error in the ENUMINPUT docHans Verkuil1-1/+1
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmtHans Verkuil4-19/+0
Now that s_fmt is no longer used for VBI format setup in subdevs, remove the VBI support from s_fmt. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: em28xx: switch to new vbi subdev opsHans Verkuil1-2/+2
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: cx231xx: switch to new vbi subdev opsHans Verkuil1-2/+2
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: pvrusb2: switch to new vbi subdev opsHans Verkuil1-1/+1
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: cx18: switch to new vbi subdev opsHans Verkuil2-4/+7
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: ivtv: switch to new vbi subdev opsHans Verkuil2-4/+7
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: tvp5150: support new vbi ops to set/get VBI formatHans Verkuil1-25/+41
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: saa7127: support new vbi ops to set/get VBI formatHans Verkuil1-10/+15
Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2010-05-19V4L/DVB: cx18: support new vbi ops to set/get VBI formatHans Verkuil3-31/+29
Also removed the bogus zeroing of fmt.sliced when setting up raw VBI. This should have been removed in ivtv, but it was just copied-and-pasted into cx18. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>