summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds2011-05-232-5/+3
|\ | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf tools: Fix sample type size calculation in 32 bits archs profile: Use vzalloc() rather than vmalloc() & memset()
| * perf tools: Fix sample type size calculation in 32 bits archsFrederic Weisbecker2011-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shift used here to count the number of bits set in the mask doesn't work above the low part for archs that are not 64 bits. Fix the constant used for the shift. This fixes a 32-bit perf top failure reported by Eric Dumazet: Can't parse sample, err = -14 Can't parse sample, err = -14 ... Reported-and-tested-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Stephane Eranian <eranian@google.com Link: http://lkml.kernel.org/r/1306200686-17317-1-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * Merge commit '559fa6e76b27' into perf/urgentIngo Molnar2011-05-231-4/+2
| |\ | | | | | | | | | | | | | | | | | | Merge reason: this commit was queued up quite some time ago but was forgotten about. Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * profile: Use vzalloc() rather than vmalloc() & memset()Jesper Juhl2010-10-311-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to memset() manually when we have vzalloc(). Signed-off-by: Jesper Juhl <jj@chaosbits.net> Cc: Arjan van de Ven <arjan@infradead.org> Cc: William Irwin <wli@holomorphy.com> LKML-Reference: <alpine.LNX.2.00.1010302150310.1572@swampdragon.chaosbits.net> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | | Merge branch 'v4l_for_linus' of ↵Linus Torvalds2011-05-23228-4766/+18715
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits) [media] gspca - sunplus: Fix some warnings and simplify code [media] gspca: Fix some warnings tied to 'no debug' [media] gspca: Unset debug by default [media] gspca - cpia1: Remove a bad conditional compilation instruction [media] gspca - main: Remove USB traces [media] gspca - main: Version change to 2.13 [media] gspca - stk014 / t613: Accept the index 0 in querymenu [media] gspca - kinect: Remove __devinitdata [media] gspca - cpia1: Fix some warnings [media] video/Kconfig: Fix mis-classified devices [media] support for medion dvb stick 1660:1921 [media] tm6000: fix uninitialized field, change prink to dprintk [media] cx231xx: Add support for Iconbit U100 [media] saa7134 add new TV cards [media] Use a more consistent value for RC repeat period [media] cx18: Move spinlock and vb_type initialisation into stream_init [media] tm6000: remove tm6010 sif audio start and stop [media] tm6000: remove unused exports [media] tm6000: add pts logging [media] tm6000: change from ioctl to unlocked_ioctl ...
| * | | [media] gspca - sunplus: Fix some warnings and simplify codeJean-François Moine2011-05-211-66/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes warnings due to GSPCA_DEBUG unsetting. It implied a simplification of the code. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca: Fix some warnings tied to 'no debug'Jean-François Moine2011-05-213-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the warnings raised by unsetting the option GSPCA_DEBUG. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca: Unset debug by defaultJean-François Moine2011-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of possible hardware or software errors does not depend on the option GSPCA_DEBUG. This one is useful only when working on the main driver or on a subdriver (bug fix, enhancement, new webcam/bridge/sensor or bug fix). It is enabled in the gspca test version which is available from my web site. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca - cpia1: Remove a bad conditional compilation instructionJean-François Moine2011-05-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a compilation error when GSPCA_DEBUG is not set. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca - main: Remove USB tracesJean-François Moine2011-05-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The USB traces are better done by usbmon which is enabled in most Linux/GNU distributions and which permits easier comparison with the USB exchanges of other drivers. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca - main: Version change to 2.13Jean-François Moine2011-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca - stk014 / t613: Accept the index 0 in querymenuJean-François Moine2011-05-212-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the kernel bug #15122. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca - kinect: Remove __devinitdataJean-François Moine2011-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | __devinit* must not be used in USB drivers. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] gspca - cpia1: Fix some warningsJean-François Moine2011-05-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some variables were set but not used. Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] video/Kconfig: Fix mis-classified devicesMauro Carvalho Chehab2011-05-211-61/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper chips are classified by their function. Unfortunaltely, with time, developers added their stuff into the wrong places. Fix it by moving itens to be at the right place. Also add a new category for sensors and for misc devices that are found only on a certain specific board. While here, fix two bad whitespaces at Kconfig. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] support for medion dvb stick 1660:1921Stéphane Elmaleh2011-05-212-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [mchehab@redhat.com: The same patch were sent by Alf and by Randoslaw. I've applied the oldest version, just fixing the entry index] Cc: Patrick Boettcher <pboettcher@kernellabs.com> Tested-by: James Huk <huk256@gmail.com> Tested-by: Alf Fahland <alf-f@gmx.de> Signed-off-by: Radoslaw Warowny <radoslaww@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: fix uninitialized field, change prink to dprintkStefan Ringel2011-05-212-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix uninitialized field, change prink to dprintk Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] cx231xx: Add support for Iconbit U100Igor Novgorodov2011-05-202-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the "Iconbit Analog Stick U100 FM". Only composite & s-video inputs, no tuner support now. Signed-off-by: Igor Novgorodov <igor@novg.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] saa7134 add new TV cardsDmitri Belimov2011-05-202-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new TV cards of Beholder Company. Just for autodetect. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] Use a more consistent value for RC repeat periodMauro Carvalho Chehab2011-05-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default REP_PERIOD is 33 ms. This doesn't make sense for IR's, as, in general, an IR repeat scancode is provided at every 110/115ms, depending on the RC protocol. So, increase its default, to do a better job avoiding ghost repeat events. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Jarod Wilson <jarod@redhat.com>
| * | | [media] cx18: Move spinlock and vb_type initialisation into stream_initSimon Farnsworth2011-05-202-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initialisation of vb_type in serialized_open was preventing REQBUFS from working reliably. Remove it, and move the spinlock into stream_init for good measure - it's only used when we have a stream that supports videobuf anyway. Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: remove tm6010 sif audio start and stopStefan Ringel2011-05-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove tm6010 sif audio start and stop Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: remove unused exportsStefan Ringel2011-05-201-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: add pts loggingStefan Ringel2011-05-201-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: change from ioctl to unlocked_ioctlStefan Ringel2011-05-201-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: all audio packets must swabStefan Ringel2011-05-201-8/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: remove input selectStefan Ringel2011-05-201-8/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: move from tm6000_set_reg to tm6000_set_reg_maskStefan Ringel2011-05-201-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | move from tm6000_set_reg to tm6000_set_reg_mask Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: remove duplicated initStefan Ringel2011-05-201-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: remove old tuner paramsStefan Ringel2011-05-201-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: remove unused capabilitiesStefan Ringel2011-05-202-10/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: add eepromStefan Ringel2011-05-201-2/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: change input controlStefan Ringel2011-05-204-669/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change input control Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: vitual input enumsStefan Ringel2011-05-201-43/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | vitual input enums Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: change to virtual inputsStefan Ringel2011-05-203-50/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change to virtual inputs Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: add tm6010 audio mode setupStefan Ringel2011-05-203-78/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add tm6010 audio mode setup Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] tm6000: add radio capabilitiesStefan Ringel2011-05-203-16/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add radio capabilities Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] Prevent null pointer derefernce of pdevHuzaifa Sidhpurwala2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure pdev is not dereferenced when it is null Signed-off-by: Huzaifa Sidhpurwala <huzaifas@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: allow to read back of detected parameters through S2APIAndreas Oberritter2011-05-201-4/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: dvb_frontend: add parameters_outAndreas Oberritter2011-05-201-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Holds the parameters detected by the demod. - Updated on every call to get_frontend, either through ioctl or when a frontend event occurs. - Reset to input parameters after every call to set_frontend, tune or search/track. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: dvb_frontend: use shortcut to access fe->dtv_property_cacheAndreas Oberritter2011-05-201-103/+108
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: dvb_frontend: remove unused assignmentsAndreas Oberritter2011-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: dvb_frontend: rename parameters to parameters_inAndreas Oberritter2011-05-201-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Preparation to distinguish input parameters from output parameters. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: call get_property at the end of dtv_property_process_getAndreas Oberritter2011-05-201-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Drivers should be able to override properties returned to the user. - The default values get prefilled from the cache. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: dtv_property_cache_submit shouldn't modifiy the cacheAndreas Oberritter2011-05-201-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use const pointers and remove assignments. - delivery_system already gets assigned by DTV_DELIVERY_SYSTEM and dtv_property_cache_sync. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] cxd2820r: Update frontend capabilities to advertise QAM-256Steve Kerrison2011-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is supported in DVB-T2 mode, so added to the T/T2 frontend. Signed-off-by: Steve Kerrison <steve@stevekerrison.com> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DocBook/dvb: Update to include DVB-T2 additionsSteve Kerrison2011-05-202-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few new capabilities added to frontend.h for DVB-T2. Added these to the documentation plus some notes explaining that they are used by the T2 delivery system. Signed-off-by: Steve Kerrison <steve@stevekerrison.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: mxl5005s: handle new bandwidths by returning -EINVALAndreas Oberritter2011-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/media/common/tuners/mxl5005s.c: In function ‘mxl5005s_set_params’: drivers/media/common/tuners/mxl5005s.c:4016: warning: enumeration value ‘BANDWIDTH_5_MHZ’ not handled in switch drivers/media/common/tuners/mxl5005s.c:4016: warning: enumeration value ‘BANDWIDTH_10_MHZ’ not handled in switch drivers/media/common/tuners/mxl5005s.c:4016: warning: enumeration value ‘BANDWIDTH_1_712_MHZ’ not handled in switch Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: drxd_hard: handle new bandwidths by returning -EINVALAndreas Oberritter2011-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/media/dvb/frontends/drxd_hard.c: In function ‘DRX_Start’: drivers/media/dvb/frontends/drxd_hard.c:2327: warning: enumeration value ‘BANDWIDTH_5_MHZ’ not handled in switch drivers/media/dvb/frontends/drxd_hard.c:2327: warning: enumeration value ‘BANDWIDTH_10_MHZ’ not handled in switch drivers/media/dvb/frontends/drxd_hard.c:2327: warning: enumeration value ‘BANDWIDTH_1_712_MHZ’ not handled in switch [mchehab@redhat.com: removed the status = status assignment after the switch] Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * | | [media] DVB: Add basic API support for DVB-T2 and bump minor versionAndreas Oberritter2011-05-205-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [steve@stevekerrison.com: Remove private definitions from cxd2820r that existed before API was defined] Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Steve Kerrison <steve@stevekerrison.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
View Lorry Controller Status