]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 12 Dec 2011 00:55:01 +0000 (11:55 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
Stephen Rothwell [Mon, 12 Dec 2011 00:51:21 +0000 (11:51 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Mon, 12 Dec 2011 00:49:53 +0000 (11:49 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Mon, 12 Dec 2011 00:48:18 +0000 (11:48 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:46:52 +0000 (11:46 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:44:52 +0000 (11:44 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 12 Dec 2011 00:44:48 +0000 (11:44 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:43:19 +0000 (11:43 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:39:56 +0000 (11:39 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Mon, 12 Dec 2011 00:38:32 +0000 (11:38 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:37:06 +0000 (11:37 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 12 Dec 2011 00:35:43 +0000 (11:35 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Mon, 12 Dec 2011 00:34:14 +0000 (11:34 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 12 Dec 2011 00:32:44 +0000 (11:32 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:26:42 +0000 (11:26 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:25:19 +0000 (11:25 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:23:48 +0000 (11:23 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:22:27 +0000 (11:22 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:21:01 +0000 (11:21 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Mon, 12 Dec 2011 00:19:24 +0000 (11:19 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 12 Dec 2011 00:18:02 +0000 (11:18 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:17:57 +0000 (11:17 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:16:30 +0000 (11:16 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 12 Dec 2011 00:15:04 +0000 (11:15 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 12 Dec 2011 00:14:47 +0000 (11:14 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:12:23 +0000 (11:12 +1100)]
Merge remote-tracking branch '4xx/next'
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Stephen Rothwell [Mon, 12 Dec 2011 00:10:00 +0000 (11:10 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:08:33 +0000 (11:08 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:06:44 +0000 (11:06 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Mon, 12 Dec 2011 00:05:19 +0000 (11:05 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Mon, 12 Dec 2011 00:03:55 +0000 (11:03 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 12 Dec 2011 00:02:32 +0000 (11:02 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Mon, 12 Dec 2011 00:01:08 +0000 (11:01 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Sun, 11 Dec 2011 23:59:29 +0000 (10:59 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 11 Dec 2011 23:54:05 +0000 (10:54 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Sun, 11 Dec 2011 23:52:44 +0000 (10:52 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S
Stephen Rothwell [Sun, 11 Dec 2011 23:51:23 +0000 (10:51 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Sun, 11 Dec 2011 23:49:58 +0000 (10:49 +1100)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h
Stephen Rothwell [Sun, 11 Dec 2011 23:49:00 +0000 (10:49 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 11 Dec 2011 23:47:40 +0000 (10:47 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c
arch/arm/mach-mxs/include/mach/common.h
Stephen Rothwell [Sun, 11 Dec 2011 23:41:48 +0000 (10:41 +1100)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
Stephen Rothwell [Sun, 11 Dec 2011 23:40:11 +0000 (10:40 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:10 +0000 (10:40 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:09 +0000 (10:40 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:08 +0000 (10:40 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Sun, 11 Dec 2011 23:40:06 +0000 (10:40 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Jean Delvare [Sun, 11 Dec 2011 22:48:41 +0000 (09:48 +1100)]
hwmon: (coretemp) Add missing section annotations
Many functions in the coretemp driver lack a proper section
annotation. Add them to let the kernel free the memory after
initialization when possible.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Durgadoss R <durgadoss.r@intel.com>
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Guenter Roeck [Sun, 11 Dec 2011 22:48:41 +0000 (09:48 +1100)]
hwmon: (lm63) Add support for LM96163
LM96163 is an enhanced version of LM63 with improved PWM resolution. Add chip
detection code as well as support for improved PWM resolution if the chip is
configured to use it.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Guenter Roeck [Sun, 11 Dec 2011 22:48:41 +0000 (09:48 +1100)]
hwmon: (lm63) Add support for external temperature offset register
LM63 and compatibles support a temperature offset register for the external
temperature sensor. Add support for it.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Guenter Roeck [Sun, 11 Dec 2011 22:48:40 +0000 (09:48 +1100)]
hwmon: (lm63) Fix checkpatch errors
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Eric Miao [Sun, 11 Dec 2011 22:48:40 +0000 (09:48 +1100)]
hwmon: (max1111) Change sysfs interface to in[0-3]_input in millivolts
This patch fixed the inconsistent max1111 sysfs interface as pointed
out by Jean Delvare:
It was pointed to me that the max1111 driver doesn't implement the
standard sysfs interface for hwmon drivers (as described in
Documentation/hwmon/sysfs-interface). It exports files adc[0-3]_in,
which
aren't part of the standard interface. Presumably these should be
renamed to in[0-3]_input. Renaming them is probably not sufficient
though, as I see no scaling done in the driver. As the MAX1111 chip has
a documented full scale of 2.048V, I take it that the LSB of the ADC
has a weight of 8 mV. Exporting raw register values to user-space is
not OK.
Reported-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
corentin.labbe [Sun, 11 Dec 2011 22:48:37 +0000 (09:48 +1100)]
i2c-ali1535: enable SPARC support
The i2c-ali1535 driver don't work on SPARC, this is because it assumes that ioport address are 16bits wide (address stored with an unsigned short).
But on SPARC arch, ioports are mapped in memory and so are stored with an unsigned long.
This patch corrects this by using pci_resource_start for getting IOMEM base address, then reading the SMBBA of the i2c busse and using together for I/O access.
I like to thanks Jean DELVARE for reviewing of my patch.
Signed-off-by: LABBE Corentin <corentin.labbe@geomatys.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Jean Delvare [Sun, 11 Dec 2011 22:48:37 +0000 (09:48 +1100)]
i2c: Fix error value returned by several bus drivers
When adding checks for ACPI resource conflicts to many bus drivers,
not enough attention was paid to the error paths, and for several
drivers this causes 0 to be returned on error in some cases. Fix this
by properly returning a non-zero value on every error.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@kernel.org
Mauro Carvalho Chehab [Sun, 11 Dec 2011 14:23:01 +0000 (12:23 -0200)]
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork:
[media] tm6000: Fix a warning at tm6000_ir_int_start()
Mauro Carvalho Chehab [Sun, 11 Dec 2011 14:20:49 +0000 (12:20 -0200)]
[media] tm6000: Fix a warning at tm6000_ir_int_start()
drivers/media/video/tm6000/tm6000-input.c: In function ‘tm6000_ir_int_start’:
drivers/media/video/tm6000/tm6000-input.c:381:3: warning: ‘return’ with no value, in function returning non-void [-Wreturn-type]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Mauro Carvalho Chehab [Sun, 11 Dec 2011 14:16:37 +0000 (12:16 -0200)]
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork: (56 commits)
[media] s5p-g2d: remove two unused variables from the G2D driver
[media] uvcvideo: Fix integer overflow in uvc_ioctl_ctrl_map()
[media] uvcvideo: Add UVC timestamps support
[media] uvcvideo: Extract timestamp-related statistics
[media] uvcvideo: Extract video stream statistics
[media] uvcvideo: Add debugfs support
[media] uvcvideo: Ignore GET_RES error for XU controls
[media] uvcvideo: Don't skip erroneous payloads
[media] uvcvideo: Make uvc_commit_video() static
[media] uvcvideo: Add support for LogiLink Wireless Webcam
[media] uvcvideo: Remove duplicate definitions of UVC_STREAM_* macros
[media] uvcvideo: Handle uvc_init_video() failure in uvc_video_enable()
[media] uvcvideo: Use videobuf2-vmalloc
[media] uvcvideo: Move fields from uvc_buffer::buf to uvc_buffer
[media] tm6000: Fix check for interrupt endpoint
[media] tm6000: Fix bad indentation
[media] tm6000: Fix fast USB access quirk
[media] V4L: cosmetic clean up
[media] gspca - zc3xx: Bad initialization of zc305/gc0303
[media] gspca - topro: Lower the frame rate in 640x480 for the tp6800
...
Mauro Carvalho Chehab [Sun, 11 Dec 2011 14:10:54 +0000 (12:10 -0200)]
Merge /home/v4l/v4l/for_upstream
* /home/v4l/v4l/for_upstream:
[media] s5p-fimc: Fix camera input configuration in subdev operations
[media] m5mols: Fix logic in sanity check
[media] ati_remote: switch to single-byte scancodes
[media] V4L: mt9m111: fix uninitialised mutex
[media] V4L: omap1_camera: fix missing <linux/module.h> include
[media] V4L: mt9t112: use after free in mt9t112_probe()
[media] V4L: soc-camera: fix compiler warnings on 64-bit platforms
[media] s5p_mfc_enc: fix s/H264/H263/ typo
[media] omap_vout: Fix compile error in 3.1
[media] au0828: add missing models 72101, 72201 & 72261 to the model matrix
[media] au0828: add missing USB ID 2040:7213
[media] au0828: add missing USB ID 2040:7260
[media] [trivial] omap24xxcam-dma: Fix logical test
[media] omap_vout: fix crash if no driver for a display
Sylwester Nawrocki [Thu, 8 Dec 2011 09:56:22 +0000 (06:56 -0300)]
[media] s5p-fimc: Fix camera input configuration in subdev operations
When using only subdev user-space operations the camera
interface input was not configured properly. Fix this by
updating the corresponding data structure in set_fmt
operation.
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>
Thomas Jarosch [Sat, 15 Oct 2011 21:38:40 +0000 (18:38 -0300)]
[media] m5mols: Fix logic in sanity check
Detected by "cppcheck".
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Kamil Debski [Fri, 9 Dec 2011 14:39:52 +0000 (11:39 -0300)]
[media] s5p-g2d: remove two unused variables from the G2D driver
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Haogang Chen [Tue, 29 Nov 2011 21:32:25 +0000 (18:32 -0300)]
[media] uvcvideo: Fix integer overflow in uvc_ioctl_ctrl_map()
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>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Sat, 24 Sep 2011 13:46:55 +0000 (10:46 -0300)]
[media] uvcvideo: Add UVC timestamps support
UVC devices transmit a device timestamp along with video frames. Convert
the timestamp to a host timestamp and use it to fill the V4L2 buffer
timestamp field.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Thu, 3 Nov 2011 15:30:17 +0000 (12:30 -0300)]
[media] uvcvideo: Extract timestamp-related statistics
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Alexey Fisher [Thu, 3 Nov 2011 14:40:08 +0000 (11:40 -0300)]
[media] uvcvideo: Extract video stream statistics
Export the statistics through debugfs.
Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Alexey Fisher [Thu, 3 Nov 2011 12:39:37 +0000 (09:39 -0300)]
[media] uvcvideo: Add debugfs support
Create a debugfs entry per UVC stream. This will be used to export
stream statistics.
Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[mchehab@redhat.com: add incude <linux/module.h> to avoid compilation breakage]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Thu, 30 Sep 2010 12:04:03 +0000 (09:04 -0300)]
[media] uvcvideo: Ignore GET_RES error for XU controls
GET_RES request support is mandatory for extension units, but some
cameras still choke on it (one example is the Logitech QuickCam PTZ that
returns a single byte for the PTZ relative control instead of four).
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Thu, 3 Nov 2011 10:24:34 +0000 (07:24 -0300)]
[media] uvcvideo: Don't skip erroneous payloads
Instead of skipping the payload completely, which would make the
resulting image corrupted anyway, store the payload normally and mark
the buffer as erroneous. If the no_drop module parameter is set to 1 the
buffer will then be passed to userspace, and tt will then be up to the
application to decide what to do with the buffer.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Thu, 3 Nov 2011 10:22:39 +0000 (07:22 -0300)]
[media] uvcvideo: Make uvc_commit_video() static
The function is not used outside of its compilation unit. Make it
static.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Wed, 2 Nov 2011 16:08:06 +0000 (13:08 -0300)]
[media] uvcvideo: Add support for LogiLink Wireless Webcam
The camera requires the PROBE_MINMAX quirk. Add a corresponding entry in
the device IDs list.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Mon, 31 Oct 2011 13:23:47 +0000 (10:23 -0300)]
[media] uvcvideo: Remove duplicate definitions of UVC_STREAM_* macros
The macros are defined in both drivers/media/video/uvc/uvc_video.c and
include/linux/usb/video.h. Remove definitions from the former.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Tue, 25 Oct 2011 12:03:42 +0000 (09:03 -0300)]
[media] uvcvideo: Handle uvc_init_video() failure in uvc_video_enable()
Turn streaming off (by selecting alternate setting 0) and disable the
video buffers queue in the uvc_video_enable() error path.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Mon, 24 Oct 2011 14:53:59 +0000 (11:53 -0300)]
[media] uvcvideo: Use videobuf2-vmalloc
Replace the current video buffers queue implementation with
videobuf2-vmalloc.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Laurent Pinchart [Mon, 24 Oct 2011 14:49:19 +0000 (11:49 -0300)]
[media] uvcvideo: Move fields from uvc_buffer::buf to uvc_buffer
Add mem, length and bytesused fields to the uvc_buffer structure and use
them instead of accessing the uvc_buffer::buf m.offset, length and
bytesused fields directly. This prepares the driver to the conversion to
videobuf2.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Anssi Hannula [Wed, 7 Dec 2011 01:34:29 +0000 (22:34 -0300)]
[media] ati_remote: switch to single-byte scancodes
The ati_remote driver currently uses 2-byte scancodes. However, one of
those bytes is actually a checksum and therefore shouldn't be considered
as part of the scancode.
Fix the driver to only use the actual data byte as a scancode and to
check the checksum itself. Update the bundled keymaps accordingly.
Since ati_remote was only migrated to the rc subsystem for 3.2, the
previous scancodes weren't emitted on any stable kernel.
Reported-by: George Spelvin <linux@horizon.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Thierry Reding [Tue, 6 Dec 2011 12:39:35 +0000 (09:39 -0300)]
[media] tm6000: Fix check for interrupt endpoint
Checking for &dev->int_in is useless because it returns the address of
the embedded struct tm6000_endpoint, which will always be positive and
therefore true.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Thierry Reding [Tue, 6 Dec 2011 12:39:36 +0000 (09:39 -0300)]
[media] tm6000: Fix bad indentation
Function parameters on subsequent lines should never be aligned with the
function name but rather be indented.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Thierry Reding [Tue, 6 Dec 2011 12:05:03 +0000 (09:05 -0300)]
[media] tm6000: Fix fast USB access quirk
The original patch used the fast USB quirk to enable fast access to
registers in the tm6000_read_write_usb(). The applied patch moved the
check to the tm6000_reset(), probably due to some merge conflicts.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Guennadi Liakhovetski [Tue, 6 Dec 2011 08:33:03 +0000 (05:33 -0300)]
[media] V4L: cosmetic clean up
Improve the use of the WARN_ON() macro and use a local variable, instead
of reduntantly dereferencing a pointer in v4l2-dev.c
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Guennadi Liakhovetski [Thu, 3 Nov 2011 11:12:00 +0000 (08:12 -0300)]
[media] V4L: mt9m111: fix uninitialised mutex
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Janusz Krzysztofik [Thu, 24 Nov 2011 23:16:35 +0000 (20:16 -0300)]
[media] V4L: omap1_camera: fix missing <linux/module.h> include
Otherwise compilation breaks with:
...
after apparently no longer included recursively from other header files.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Dan Carpenter [Mon, 7 Nov 2011 18:44:12 +0000 (15:44 -0300)]
[media] V4L: mt9t112: use after free in mt9t112_probe()
priv gets dereferenced in mt9t112_set_params() so we should return
before calling that.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Guennadi Liakhovetski [Mon, 5 Dec 2011 19:01:13 +0000 (16:01 -0300)]
[media] V4L: soc-camera: fix compiler warnings on 64-bit platforms
On 64-bit platforms assigning a pointer to a 32-bit variable causes a
compiler warning and cannot actually work. Soc-camera currently doesn't
support any 64-bit systems, but such platforms can be added in the
and in any case compiler warnings should be avoided.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Peter Korsgaard [Mon, 5 Dec 2011 09:12:15 +0000 (06:12 -0300)]
[media] s5p_mfc_enc: fix s/H264/H263/ typo
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Aked-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Jean-François Moine [Wed, 30 Nov 2011 09:48:38 +0000 (06:48 -0300)]
[media] gspca - zc3xx: Bad initialization of zc305/gc0303
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Jean-François Moine [Wed, 30 Nov 2011 09:22:29 +0000 (06:22 -0300)]
[media] gspca - topro: Lower the frame rate in 640x480 for the tp6800
The topro webcams don't support 30fps in 640x480 mode.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Jean-François Moine [Wed, 30 Nov 2011 09:20:07 +0000 (06:20 -0300)]
[media] gspca - sonixj: Change color control for sensor po2030n
Adjustment of the colors by the po2030n is finer than by the bridge controls.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Jean-François Moine [Wed, 30 Nov 2011 08:58:20 +0000 (05:58 -0300)]
[media] gspca - sonixj: Bad sensor mode at start time
The 'open-drain' mode was not reset when starting the webcams.
This problem was introduced by commit
0e4d413af1a9d and
its exact effects are unknown.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Jean-François Moine [Wed, 30 Nov 2011 08:54:16 +0000 (05:54 -0300)]
[media] gspca: Remove the useless variable 'nbalt'
As the alternate settings are now sorted in gspca main,
the variable 'nbalt' is no more useful.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Jean-François Moine [Wed, 30 Nov 2011 08:12:54 +0000 (05:12 -0300)]
[media] gspca: Remove the useless variable 'reverse_alts'
The alternate settings are now sorted in gspca main, so the flag
'reverse_alts' is no more useful.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Malcolm Priestley [Sun, 4 Dec 2011 11:20:37 +0000 (08:20 -0300)]
[media] it913x: multiple devices on system. Copy ite_config to priv area
If there are two or more different it913x devices on the system they share the same
ite_config and over write its settings.
To over come this, the ite_config is copied to the priv area.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Sylwester Nawrocki [Sat, 3 Dec 2011 11:37:06 +0000 (08:37 -0300)]
[media] Remove unneeded comments from the media API DocBook files
This removes comment tags intended for emacs configuration from
67 files in the Media API DocBook. Such comments are not really
helpful and violate the coding style rules.
Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Malcolm Priestley [Thu, 1 Dec 2011 20:35:48 +0000 (17:35 -0300)]
[media] it913x add retry to USB bulk endpoints and IO
This a bus repeater for it913x devices. Commands usually fail because of other
activity on the USB bus.
Bulk failures that report -ETIMEDOUT or -EBUSY are repeated.
Enpoints that return actlen not equal len request -EAGAIN.
The retry is set at 10.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Gary Thomas [Thu, 1 Dec 2011 11:51:09 +0000 (08:51 -0300)]
[media] omap_vout: Fix compile error in 3.1
This patch is against the mainline v3.1 release (
c3b92c8 ) and
fixes a compile error when building for OMAP3+DSS+VOUT
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Malcolm Priestley [Wed, 30 Nov 2011 20:17:43 +0000 (17:17 -0300)]
[media] dvb_get_firmware: updates for it913x
Changes to extract firmware for it913x devices
./get_dvb_firmware it9135
extracts
dvb-usb-it9135-01.fw
dvb-usb-it9135-02.fw
./get_dvb_firmware it9137
extracts
dvb-usb-it9137-01.fw
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Malcolm Priestley [Wed, 30 Nov 2011 20:16:09 +0000 (17:16 -0300)]
[media] it9135: add support for IT9135 9005 devices
Support add for IT9135 9005 devices
With this patch IT9135 devices now move to using
dvb-usb-it9135-01.fw firmware
IT9137 remain on previous firmware.
IT9135 devices seem more stable on this firmware.
If the user wishes to remain on it9137 firmware they can change
back using firmware=1 module option.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Malcolm Priestley [Wed, 30 Nov 2011 20:14:47 +0000 (17:14 -0300)]
[media] dvb-usb/it913x: multi firmware loader
Multi firmware loader
This uses scatter write firmware headers
The firmware must start with 03 XX 00
and be the extract firmware length.
I have tried all available firmwares with this loader.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Michael Krufky [Tue, 29 Nov 2011 21:55:04 +0000 (18:55 -0300)]
[media] au0828: add missing models 72101, 72201 & 72261 to the model matrix
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Michael Krufky [Tue, 29 Nov 2011 21:23:11 +0000 (18:23 -0300)]
[media] au0828: add missing USB ID 2040:7213
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Michael Krufky [Tue, 29 Nov 2011 21:21:41 +0000 (18:21 -0300)]
[media] au0828: add missing USB ID 2040:7260
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Malcolm Priestley [Mon, 28 Nov 2011 21:22:41 +0000 (18:22 -0300)]
[media] it913x: support for NEC extended keys
Add support for NEC extended keys.
The default remote has now changed to RC_MAP_MSI_DIGIVOX_III
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>