git.karo-electronics.de Git - karo-tx-linux.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stephen Rothwell [Sun, 11 Dec 2011 23:49:00 +0000 (10:49 +1100)]

Merge remote-tracking branch 'arm-perf/for-next/perf'

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stephen Rothwell [Sun, 11 Dec 2011 23:40:11 +0000 (10:40 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Sun, 11 Dec 2011 23:40:10 +0000 (10:40 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Sun, 11 Dec 2011 23:40:09 +0000 (10:40 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Sun, 11 Dec 2011 23:40:08 +0000 (10:40 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

Stephen Rothwell [Sun, 11 Dec 2011 23:40:06 +0000 (10:40 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Jim Cromie [Tue, 6 Dec 2011 19:11:31 +0000 (12:11 -0700)]

kernel/params: replace DEBUGP with pr_debug

Use more flexible pr_debug. This allows:

echo "module params +p" > /dbg/dynamic_debug/control

to turn on debug messages when needed.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Jim Cromie [Tue, 6 Dec 2011 19:11:31 +0000 (12:11 -0700)]

module: replace DEBUGP with pr_debug

Use more flexible pr_debug. This allows:

echo "module module +p" > /dbg/dynamic_debug/control

to turn on debug messages when needed.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Sun, 11 Dec 2011 22:48:48 +0000 (09:48 +1100)]

lguest: move the lguest tool to the tools directory (fixes)

Fixup complilation breakage from move.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Davidlohr Bueso [Fri, 2 Dec 2011 21:52:39 +0000 (22:52 +0100)]

lguest: move the lguest tool to the tools directory

This is a better location instead of having it in Documentation.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

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()

commit | commitdiff | tree

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>

commit | commitdiff | tree

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
  ...

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

commit | commitdiff | tree

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>

Linux kernel for KaRo TX COM modules

RSS Atom