aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'linux-stable/linux-3.0.y' into ↵Ziyan2015-10-2512-104/+118
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | p-android-omap-3.0-dev-espresso Conflicts: Makefile arch/arm/include/asm/hardware/cache-l2x0.h arch/arm/kernel/smp.c arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-omap4panda.c arch/arm/mach-omap2/opp.c arch/ia64/include/asm/futex.h drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c drivers/firmware/efivars.c drivers/gpu/drm/i915/intel_lvds.c drivers/gpu/drm/radeon/radeon_atombios.c drivers/gpu/drm/radeon/radeon_irq_kms.c drivers/hwmon/fam15h_power.c drivers/mfd/twl6030-irq.c drivers/mmc/core/sdio.c drivers/net/tun.c drivers/net/usb/ipheth.c drivers/net/usb/usbnet.c drivers/usb/core/hub.c drivers/usb/host/xhci-mem.c drivers/usb/host/xhci.h drivers/usb/musb/omap2430.c drivers/usb/serial/ftdi_sio.c drivers/usb/serial/ftdi_sio_ids.h drivers/usb/serial/option.c drivers/usb/serial/qcserial.c drivers/usb/serial/ti_usb_3410_5052.c drivers/usb/serial/ti_usb_3410_5052.h drivers/video/omap2/dss/hdmi.c fs/splice.c include/asm-generic/pgtable.h include/net/sch_generic.h kernel/cgroup.c kernel/futex.c kernel/time/timekeeping.c net/ipv4/route.c net/ipv4/syncookies.c net/ipv4/tcp_ipv4.c net/wireless/util.c security/commoncap.c sound/soc/soc-dapm.c
| * media: mantis: fix silly crash caseAlan Cox2013-05-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e1d45ae10aea8e8a403e5d96bf5902ee670007ff upstream. If we set mantis->fe to NULL on an error its not a good idea to then try passing NULL to the unregister paths and oopsing really. Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=16473 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: rc: unlock on error in show_protocols()Dan Carpenter2013-03-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 upstream. We recently introduced a new return -ENODEV in this function but we need to unlock before returning. [mchehab@redhat.com: found two patches with the same fix. Merged SOB's/acks into one patch] Acked-by: Herton R. Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Douglas Bagnall <douglas@paradise.net.nz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: au0828: fix case where STREAMOFF being called on stopped stream ↵Devin Heitmueller2012-10-281-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causes BUG() commit a595c1ce4c9d572cf53513570b9f1a263d7867f2 upstream. We weren't checking whether the resource was in use before calling res_free(), so applications which called STREAMOFF on a v4l2 device that wasn't already streaming would cause a BUG() to be hit (MythTV). Reported-by: Larry Finger <larry.finger@lwfinger.net> Reported-by: Jay Harbeston <jharbestonus@gmail.com> Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| * media: rc: ite-cir: Initialise ite_dev::rdev earlierBen Hutchings2012-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4b961180ef275035b1538317ffd0e21e80e63e77 upstream. ite_dev::rdev is currently initialised in ite_probe() after rc_register_device() returns. If a newly registered device is opened quickly enough, we may enable interrupts and try to use ite_dev::rdev before it has been initialised. Move it up to the earliest point we can, right after calling rc_allocate_device(). Reported-and-tested-by: YunQiang Su <wzssyqa@gmail.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: Avoid sysfs oops when an rc_dev's raw device is absentDouglas Bagnall2012-10-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 720bb6436ff30fccad05cf5bdf961ea5b1f5686d upstream. For some reason, when the lirc daemon learns that a usb remote control has been unplugged, it wants to read the sysfs attributes of the disappearing device. This is useful for uncovering transient inconsistencies, but less so for keeping the system running when such inconsistencies exist. Under some circumstances (like every time I unplug my dvb stick from my laptop), lirc catches an rc_dev whose raw event handler has been removed (presumably by ir_raw_event_unregister), and proceeds to interrogate the raw protocols supported by the NULL pointer. This patch avoids the NULL dereference, and ignores the issue of how this state of affairs came about in the first place. Version 2 incorporates changes recommended by Mauro Carvalho Chehab (-ENODEV instead of -EINVAL, and a signed-off-by). Signed-off-by: Douglas Bagnall <douglas@paradise.net.nz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * USB: smsusb: remove __devinit* from the struct usb_device_id tableGreg Kroah-Hartman2012-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d04dbd1c0ec17a13326c8f2279399c225836a79f upstream. This structure needs to always stick around, even if CONFIG_HOTPLUG is disabled, otherwise we can oops when trying to probe a device that was added after the structure is thrown away. Thanks to Fengguang Wu and Bjørn Mork for tracking this issue down. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Reported-by: Bjørn Mork <bjorn@mork.no> CC: Mauro Carvalho Chehab <mchehab@infradead.org> CC: Michael Krufky <mkrufky@linuxtv.org> CC: Paul Gortmaker <paul.gortmaker@windriver.com> CC: Doron Cohen <doronc@siano-ms.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * USB: spca506: remove __devinit* from the struct usb_device_id tableGreg Kroah-Hartman2012-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e694d518886c7afedcdd1732477832b2e32744e4 upstream. This structure needs to always stick around, even if CONFIG_HOTPLUG is disabled, otherwise we can oops when trying to probe a device that was added after the structure is thrown away. Thanks to Fengguang Wu and Bjørn Mork for tracking this issue down. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Reported-by: Bjørn Mork <bjorn@mork.no> CC: Hans de Goede <hdegoede@redhat.com> CC: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: dvb-core: Release semaphore on error path dvb_register_device()Santosh Nayak2012-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | commit 82163edcdfa4eb3d74516cc8e9f38dd3d039b67d upstream. There is a missing "up_write()" here. Semaphore should be released before returning error value. Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: smsusb: add autodetection support for USB ID 2040:f5a0Michael Krufky2012-07-161-0/+2
| | | | | | | | | | | | | | | | | | commit 3e1141e2ce5667301a74ca2ef396d9bd5e995f7f upstream. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: uvcvideo: Fix ENUMINPUT handlingLaurent Pinchart2012-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 31c5f0c5e25ed71eeced170f113bb590f2f1f6f3 upstream. Properly validate the user-supplied index against the number of inputs. The code used the pin local variable instead of the index by mistake. Reported-by: Jozef Vesely <vesely@gjh.sk> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * smsusb: add autodetection support for USB ID 2040:c0a0Michael Krufky2012-06-011-0/+2
| | | | | | | | | | | | | | | | | | commit 4d1b58b84472d1d300a66e1c5fd765b21e74ba15 upstream. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: rc: Postpone ISR registrationLuis Henriques2012-05-215-93/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9ef449c6b31bb6a8e6dedc24de475a3b8c79be20 upstream. An early registration of an ISR was causing a crash to several users (for example, with the ite-cir driver: http://bugs.launchpad.net/bugs/972723). The reason was that IRQs were being triggered before a driver initialisation was completed. This patch fixes this by moving the invocation to request_irq() and to request_region() to a later stage on the driver probe function. Signed-off-by: Luis Henriques <luis.henriques@canonical.com> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * media: rc-core: set mode for winbond-cirDavid Härdeman2012-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d9b786955f80fb306471fdb9ea24c6d03af6ca36 upstream. Setting the correct mode is required by rc-core or scancodes won't be generated (which isn't very user-friendly). This one-line fix should be suitable for 3.4-rc2. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * pvrusb2: fix 7MHz & 8MHz DVB-T tuner support for HVR1900 rev D1F5Michael Krufky2012-04-021-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9ab2393fc3e460cd2040de1483918eb17abb822f upstream. The D1F5 revision of the WinTV HVR-1900 uses a tda18271c2 tuner instead of a tda18271c1 tuner as used in revision D1E9. To account for this, we must hardcode the frontend configuration to use the same IF frequency configuration for both revisions of the device. 6MHz DVB-T is unaffected by this issue, as the recommended IF Frequency configuration for 6MHz DVB-T is the same on both c1 and c2 revisions of the tda18271 tuner. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * lgdt330x: fix signedness error in i2c_read_demod_bytes()Xi Wang2012-04-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 34817174fca0c5512c2d5b6ea0fc37a0337ce1d8 upstream. The error handling in lgdt3303_read_status() and lgdt330x_read_ucblocks() doesn't work, because i2c_read_demod_bytes() returns a u8 and (err < 0) is always false. err = i2c_read_demod_bytes(state, 0x58, buf, 1); if (err < 0) return err; Change the return type of i2c_read_demod_bytes() to int. Also change the return value on error to -EIO to make (err < 0) work. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * hdpvr: fix race conditon during start of streamingJanne Grunau2012-02-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | commit afa159538af61f1a65d48927f4e949fe514fb4fc upstream. status has to be set to STREAMING before the streaming worker is queued. hdpvr_transmit_buffers() will exit immediately otherwise. Reported-by: Joerg Desch <vvd.joede@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | [Media:Radio] WiLink: Add support for complete scanManjunatha Halli2012-08-066-26/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for complete scan feature. To start/stop/read complete scan user has to write to '/sys/class/video4linux/radio0/fmrx_comp_scan' After complete scan read on /dev/radio will give the scanned results Change-Id: Ic02408cfbfcea3c10623da8f377a0224ce7b4c31 Signed-off-by: Manjunatha Halli <x0130808@ti.com>
* | [Media:Radio] WiLink: Miscellaneous fixes for FM ReceiverManjunatha Halli2012-08-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | This patch fixes below small issues with FM RX, 1) Enables the support for FM Alternate Frequency 2) Modifies Wrap_Seek such that seek will try for one time and if it didn't get a good station within, then returns the default frequency according to band. Change-Id: Id9ca57451847617fade8959154f205cfff06faee Signed-off-by: Manjunatha Halli <x0130808@ti.com>
* | [Media:Radio] WiLink: Add support for Russian BandManjunatha Halli2012-08-064-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for russian band (frequency range 65.8 MHz to 74 MHz). This frequency range comes under OIRT FM broadcast band which is currently used by Russia,Belarus,Moldova and Ukraine. User app has to write "2" to "/sys/class/video4linux/radio0/fmrx_band" to switch to Russian/OIRT band. Change-Id: I26ea5b54afab10eb1769e0b07421d0b98ca24eee Signed-off-by: Manjunatha Halli <x0130808@ti.com>
* | [Media:Radio] wl12xx: Fix for overflow while getting irq statusManjunatha Halli2012-08-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | ->dlen is 8 bit long and so while memcpy there is a chance that fmdev->irq_info.flag will overflow. So this patch removes memcpy and instead copies the 16bit flag register value from skb->data to fmdev->irq_info.flag directly. Change-Id: I37604b91b2777ed9e56a7e1c1ecefe32e9024170 Signed-off-by: Manjunatha Halli <x0130808@ti.com>
* | OMAP: TILER: Optimize placement for NV12 buffersAndy Gross2012-06-152-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the behaviour when allocating 2D buffers. If the required alignment is less than 4KiB and a security token is set, the allocation will be flagged specifically for this format. All subsequent buffers of the same format and size will be placed inside this area until the area is exhausted. For NV12 allocations, this means that all Y allocations will share one area, and the UV allocations will share another. Change-Id: I13d29257c0cbab627c2938d4623557918448ee86 Signed-off-by: Andy Gross <andy.gross@ti.com>
* | UVC: Enable CONFIG_USB_VIDEO_CLASS to default.Saravanan Solaiyappan2012-06-151-0/+1
| | | | | | | | | | | | | | Enables the USB camera support in V4L driver. Change-Id: Ief86b72fb4216adcf1c4fb11cff0f4f5c61998f9 Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
* | Merge latest changes from google kernel/common.gitRoman Shaposhnikov2012-06-134-3/+17
| | | | | | | | | | | | | | Kernel version updated to 3.0.31 Change-Id: Ifbd7150801f3beeec9cbaa566f249d8019ef9348 Signed-off-by: Roman Shaposhnikov <x0166637@ti.com>
* | OMAP: TILER: validate input width and heightAndy Gross2012-05-221-12/+17
| | | | | | | | | | | | | | | | | | | | Add validation of input width and height to ensure that it does not exceed maximum pixel width and height for the specific format. Validate maximum length for 1D allocations. Change-Id: I64b00f93a312ae715a040da28a0b0fe663afa9d8 Signed-off-by: Andy Gross <andy.gross@ti.com>
* | TILER: Add tiler_backpages methodLajos Molnar2012-05-151-11/+50
| | | | | | | | | | | | | | | | | | | | | | | | tiler_backpages method can be used to get the number of pages required for a tiler allocation. This method is called before the memory is partitioned, therefore, we cannot rely on tiler being initialized. Separated geometry initialization for this purpose. Change-Id: Ia68cbd81c31a357fdc51036753db222d21994996 Signed-off-by: Lajos Molnar <lajos@ti.com> Signed-off-by: Dima Svetlov <svetlov@ti.com>
* | OMAP4: ION/TILER: Expose virtual stride and sizeAndy Gross2012-03-211-0/+6
| | | | | | | | | | | | | | | | | | | | Added an interface to query the virtual stride and size from the tiler buffer via an ION handle. Change-Id: Iac756475236d3463b1aeaa6e29767ba03e758851 Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Atanas (Tony) Zlatinski <zlatinski@gmail.com> Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
* | OMAP4: TILER: Adds func to fill the virt. sizesAtanas (Tony) Zlatinski2012-03-211-0/+45
| | | | | | | | | | | | | | | | Adds public tiler_fill_virt_array() that deals with non-page-aligned addresses correctly. Change-Id: I31f4aa9a2e81cd84e393529b6534674811f99563 Signed-off-by: Atanas (Tony) Zlatinski <zlatinski@gmail.com>
* | OMAP4: TILER: Add offset parameter for allocationAndy Gross2012-03-216-47/+70
| | | | | | | | | | | | | | | | | | | | | | Add offset parameter for use in tiler_alloc_block_area_aligned. This allows a user to get a tiler allocation with a specific alignment and offset. Change-Id: I8b1b9dd17bc9def124ea92cbbede2f3c56823387 Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Tony Zlatinski <x0146664@ti.com> Signed-off-by: Atanas (Tony) Zlatinski <zlatinski@gmail.com>
* | OMAP4: TILER: Add variable alignment allocation APIAndy Gross2012-03-216-140/+182
| | | | | | | | | | | | | | | | | | | | | | Added tiler_alloc_block_area_aligned API to allow for variable alignment when allocating when using the kernel APIs. Change-Id: I2f3c44675a3fa1b2c6dfef21ccdd9bcac2f1d0e5 Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Tony Zlatinski <x0146664@ti.com> Signed-off-by: Atanas (Tony) Zlatinski <zlatinski@gmail.com>
* | wl128x: Fix checkpatch errorsManjunatha Halli2012-02-151-12/+12
| | | | | | | | | | Change-Id: Ie82304079b79650468939984ad8127f51fa64824 Signed-off-by: Manjunatha Halli <x0130808@ti.com>
* | OMAP: TILER: Kconfig: Disable tiler ioctl interfaceShivananda Hebbar2012-02-151-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | TILER provided an interface to userspace through a character driver /dev/tiler, and through a MemMgr API in the userspace. This TILER ioctl interface is currently deprecated. The kernel config options have been changed accordingly to avoid any misuse. Change-Id: Ia69f4f6161e6f4d5fb45ef12aaac5976e0bdd53d Signed-off-by: Shivananda Hebbar <x0hebbar@ti.com> Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
* | OMAP: TILER: Make character driver creation configurableShivananda Hebbar2012-02-152-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | The TILER code that creates the character driver code and interacts with the userspace has been placed under the kernel configuration option that controls the userspace, so that the cdev creation is bypassed when userspace is disabled. Change-Id: I3d5d372433fc89e676e54088dc8af8bdb74b8007 Signed-off-by: Shivananda Hebbar <x0hebbar@ti.com> Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com>
* | drivers:media:radio:wl128x Add FM TX AF support via sysfs entriesManjunatha Halli2012-02-105-13/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for FM TX Alternate Frequency set via below sysfs entry "/sys/class/video4linux/radio0/fmtx_rds_af" User has to write required frequency to this sysfs entry so that driver will enable the FM TX RDS AF feature and starts transmitting in both primary frequency and alternate frequency at the same time. Change-Id: I0d4b232a2adb450370c21b88eccc842114e31ded Signed-off-by: Manjunatha Halli <x0130808@ti.com>
* | OMAP: TILER: Add bounds checking on format inputsAndy Gross2012-02-031-0/+4
| | | | | | | | | | | | | | Added bounds checking to validate incoming tiler format. Change-Id: Icd791cc294ecb1838afb3f91451626debd59c29e Signed-off-by: Andy Gross <andy.gross@ti.com>
* | Merge branch 'linux-3.0.18' into p-android-omap-3.0Dan Murphy2012-02-0219-81/+579
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/smartreflex.c drivers/i2c/busses/i2c-omap.c drivers/usb/host/ehci.h drivers/usb/musb/musb_core.c fs/proc/base.c Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * uvcvideo: Fix integer overflow in uvc_ioctl_ctrl_map()Haogang Chen2012-01-252-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 806e23e95f94a27ee445022d724060b9b45cb64a upstream. There is a potential integer overflow in uvc_ioctl_ctrl_map(). When a large xmap->menu_count is passed from the userspace, the subsequent call to kmalloc() will allocate a buffer smaller than expected. map->menu_count and map->menu_info would later be used in a loop (e.g. in uvc_query_v4l2_ctrl), which leads to out-of-bound access. The patch checks the ioctl argument and returns -EINVAL for zero or too large values in xmap->menu_count. Signed-off-by: Haogang Chen <haogangchen@gmail.com> [laurent.pinchart@ideasonboard.com Prevent excessive memory consumption] Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * V4L/DVB: v4l2-ioctl: integer overflow in video_usercopy()Dan Carpenter2012-01-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 6c06108be53ca5e94d8b0e93883d534dd9079646 upstream. If ctrls->count is too high the multiplication could overflow and array_size would be lower than expected. Mauro and Hans Verkuil suggested that we cap it at 1024. That comes from the maximum number of controls with lots of room for expantion. $ grep V4L2_CID include/linux/videodev2.h | wc -l 211 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * media: s5p-fimc: Use correct fourcc for RGB565 colour formatSylwester Nawrocki2012-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f83f71fda27650ae43558633be93652577dbc38c upstream. With 16-bit RGB565 colour format pixels are stored by the device in memory in the following order: | b3 | b2 | b1 | b0 | ~+-----+-----+-----+-----+ | R5 G6 B5 | R5 G6 B5 | This corresponds to V4L2_PIX_FMT_RGB565 fourcc, not V4L2_PIX_FMT_RGB565X. This change is required to avoid trouble when setting up video pipeline with the s5p-tv devices, so the colour formats at both devices can be properly matched. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * saa7164: Add support for another HVR2200 hardware revisionTony Jago2011-11-263-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 62dd28d0c659db29bdb89cfe9f0aefe42f0adfe9 upstream. Hauppauge have released a new model rev, sub id 8940, this adds support. [stoth@kernellabs.com: I modified Tony's patch slightly in relation to the card numbering in saa7164.h, appending rather than inserting the new card - normal practise] Signed-off-by: Tony Jago <tony@hammertelecom.com.au> Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * tuner_xc2028: Allow selection of the frequency adjustment code for XC3028Mauro Carvalho Chehab2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 9bed77ee2fb46b74782d0d9d14b92e9d07f3df6e upstream. This device is not using the proper demod IF. Instead of using the IF macro, it is specifying a IF frequency. This doesn't work, as xc3028 needs to load an specific SCODE for the tuner. In this case, there's no IF table for 5 MHz. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * dib0700: protect the dib0700 buffer accessOlivier Grenie2011-11-111-9/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit bff469f4167fdabfe15294f375577d7eadbaa1bb upstream. This patch protects the common buffer access inside the dib0700 in order to manage concurrent access. This protection is done using mutex. Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Florian Mickler <florian@mickler.org> Signed-off-by: Javier Marcet <javier@marcet.info> Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr> Signed-off-by: Patrick Boettcher <patrick.boettcher@dibcom.fr> [mchehab@redhat.com: dprint requires 3 arguments. Replaced by dib_info] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * DiBcom: protect the I2C bufer accessPatrick Boettcher2011-11-118-67/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 79fcce3230b140f7675f8529ee53fe2f9644f902 upstream. This patch protects the I2C buffer access in order to manage concurrent access. This protection is done using mutex. Furthermore, for the dib9000, if a pid filtering command is received during the tuning, this pid filtering command is delayed to avoid any concurrent access issue. Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Florian Mickler <florian@mickler.org> Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr> Signed-off-by: Patrick Boettcher <Patrick.Boettcher@dibcom.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * uvcvideo: Set alternate setting 0 on resume if the bus has been resetMing Lei2011-11-113-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d59a7b1dbce8b972ec2dc9fcaaae0bfa23687423 upstream. If the bus has been reset on resume, set the alternate setting to 0. This should be the default value, but some devices crash or otherwise misbehave if they don't receive a SET_INTERFACE request before any other video control request. Microdia's 0c45:6437 camera has been found to require this change or it will stop sending video data after resume. uvc_video.c] Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-314-61/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (485 commits) ARM: omap: counter: add locking to read_persistent_clock ARM: smp_twd: use clockevents_update_freq to update frequency Revert "clockevents: Provide interface to reconfigure an active clock event device" OMAP3+: PM: SR/Class3: disable errorgen before disable VP OMAP3+: Smartreflex: fix err interrupt disable sequence OMAP4: PM: Add Static dependency MPU->L3_2 OMAP4 HDCP Add enable delay for HDCP. gpu: pvr: make ACTIVE_POWER_LATENCY a module param gpu: pvr: implement intra-frame dvfs gpu: pvr: add idle logging gpu: pvr: enbable idle callbacks gpu: pvr: refactor DVFS gpu: pvr: make ACTIVE_POWER_LATENCY_MS respect config option Fix for ProcessFlip ARM: omap4: make prcm_interrupt be no_suspend ARM: common: fiq_debugger: make uart irq be no_suspend net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT ASoC: ABE: Correct monitoring filter for Vx-UL and BT-UL mm: avoid livelock on !__GFP_FS allocations mmc: block: Improve logging of handling emmc timeouts ... Change-Id: I7be66ad875926ec8bf531c232e6409c1095539aa
| * \ Merge commit 'v3.0.8' into linux-omap-3.0Colin Cross2011-10-274-61/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/tty/serial/omap-serial.c drivers/usb/musb/musb_gadget.c sound/soc/omap/omap-mcbsp.c Change-Id: Ic31b7266dda3ac8483f737272874ebf4725b5fe3
| | * uvcvideo: Fix crash when linking entitiesLaurent Pinchart2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4d9b2ebd335d83044b9e6656d0e604e8e1300334 upstream. The uvc_mc_register_entity() function wrongfully selects the media_entity associated with a UVC entity when creating links. This results in access to uninitialized media_entity structures and can hit a BUG_ON statement in media_entity_create_link(). Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Josh Boyer <jwboyer@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * vp7045: fix buffer setupFlorian Mickler2011-10-031-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit fc61ccd35fd59d5362d37c8bf9c0526c85086c84 upstream. dvb_usb_device_init calls the frontend_attach method of this driver which uses vp7045_usb_ob. In order to have a buffer ready in vp7045_usb_op, it has to be allocated before that happens. Luckily we can use the whole private data as the buffer as it gets separately allocated on the heap via kzalloc in dvb_usb_device_init and is thus apt for use via usb_control_msg. This fixes a BUG: unable to handle kernel paging request at 0000000000001e78 reported by Tino Keitel and diagnosed by Dan Carpenter. Tested-by: Tino Keitel <tino.keitel@tikei.de> Signed-off-by: Florian Mickler <florian@mickler.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * nuvoton-cir: simplify raw IR sample handlingJarod Wilson2011-10-032-38/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit de4ed0c111ed078b8729a5cc49c23197740f5bad upstream. The nuvoton-cir driver was storing up consecutive pulse-pulse and space-space samples internally, for no good reason, since ir_raw_event_store_with_filter() already merges back to back like samples types for us. This should also fix a regression introduced late in 3.0 that related to a timeout change, which actually becomes correct when coupled with this change. Tested with RC6 and RC5 on my own nuvoton-cir hardware atop vanilla 3.0.0, after verifying quirky behavior in 3.0 due to the timeout change. Reported-by: Stephan Raue <sraue@openelec.tv> CC: Stephan Raue <sraue@openelec.tv> Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | drivers:media:radio: wl128x: Fix for few issues relates to audio and rssi levelManjunatha Halli2011-10-213-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes below issues 1) FM audio volume gain setting 2) Default rssi level is set to 8 instead of 20 3) Issue related to audio mute/unmute Change-Id: I4b73a9ee9d382bd8cfe6c2b6d7ac56a1823bcee4 Signed-off-by: Manjunatha Halli <x0130808@ti.com>