linux-2.6
15 years agoV4L/DVB (11593): stv090x: Fix Rolloff
Andreas Regel [Thu, 16 Apr 2009 11:40:36 +0000 (08:40 -0300)] 
V4L/DVB (11593): stv090x: Fix Rolloff

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11592): stv6110x: Fix read bug
Andreas Regel [Thu, 16 Apr 2009 11:38:46 +0000 (08:38 -0300)] 
V4L/DVB (11592): stv6110x: Fix read bug

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11591): stv090x: code simplification
Manu Abraham [Wed, 8 Apr 2009 23:30:29 +0000 (20:30 -0300)] 
V4L/DVB (11591): stv090x: code simplification

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11590): stv090x: code simplification
Manu Abraham [Wed, 8 Apr 2009 23:24:53 +0000 (20:24 -0300)] 
V4L/DVB (11590): stv090x: code simplification

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11589): stv090x: code simplification
Manu Abraham [Wed, 8 Apr 2009 23:18:50 +0000 (20:18 -0300)] 
V4L/DVB (11589): stv090x: code simplification

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11588): stv090x: support > 60MSPS, simplify Srate calculation
Manu Abraham [Wed, 8 Apr 2009 23:14:00 +0000 (20:14 -0300)] 
V4L/DVB (11588): stv090x: support > 60MSPS, simplify Srate calculation

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11587): stv090x: set DiSEqC frequency to 22kHz
Manu Abraham [Wed, 8 Apr 2009 22:45:43 +0000 (19:45 -0300)] 
V4L/DVB (11587): stv090x: set DiSEqC frequency to 22kHz

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11586): stv090x: switch i/p ADC as well during Power management
Manu Abraham [Wed, 8 Apr 2009 21:27:10 +0000 (18:27 -0300)] 
V4L/DVB (11586): stv090x: switch i/p ADC as well during Power management

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11585): stv090x: fix incorrectly used mode
Andreas Regel [Wed, 8 Apr 2009 20:28:41 +0000 (17:28 -0300)] 
V4L/DVB (11585): stv090x: fix incorrectly used mode

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11584): stv090x: add tone burst control
Andreas Regel [Wed, 8 Apr 2009 20:27:51 +0000 (17:27 -0300)] 
V4L/DVB (11584): stv090x: add tone burst control

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11583): isl6423: Various fixes to use external modulation
Andreas Regel [Tue, 7 Apr 2009 19:09:52 +0000 (16:09 -0300)] 
V4L/DVB (11583): isl6423: Various fixes to use external modulation

Use external modulation

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11582): stv090x: fix Undocumented Registers
Manu Abraham [Tue, 7 Apr 2009 19:08:26 +0000 (16:08 -0300)] 
V4L/DVB (11582): stv090x: fix Undocumented Registers

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11581): stv090x and stv6110x: fix repeater level setup and ref clock
Manu Abraham [Tue, 7 Apr 2009 08:19:54 +0000 (05:19 -0300)] 
V4L/DVB (11581): stv090x and stv6110x: fix repeater level setup and ref clock

* Reference clock was unused
* Fix missing repeater level setup

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11580): budget-ci: Fix incorrect default CLOCK setup
Andreas Regel [Mon, 6 Apr 2009 18:46:50 +0000 (15:46 -0300)] 
V4L/DVB (11580): budget-ci: Fix incorrect default CLOCK setup

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: MAnu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11579): Initial go at TT S2-1600
Manu Abraham [Mon, 6 Apr 2009 18:45:20 +0000 (15:45 -0300)] 
V4L/DVB (11579): Initial go at TT S2-1600

[mchehab@redhat.com: fix compilation when the new drivers aren't selected]

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11574): uvcvideo: fill reserved fields with zero of VIDIOC_QUERYMENU
Márton Németh [Mon, 20 Apr 2009 17:51:49 +0000 (14:51 -0300)] 
V4L/DVB (11574): uvcvideo: fill reserved fields with zero of VIDIOC_QUERYMENU

When querying menu items with VIDIOC_QUERYMENU the reserved field
is not set to zero as required by V4L2 API revision 0.24 [1].
Add this fill.

The patch was tested with v4l-test 0.11 [2] with CNF7129 webcam found
on EeePC 901.

References:
[1] V4L2 API specification, revision 0.24
    http://v4l2spec.bytesex.org/spec/r13317.htm#V4L2-QUERYMENU

[2] v4l-test: Test environment for Video For Linux Two API
    http://v4l-test.sourceforge.net/

[Modified by Laurent Pinchart]

Use u32 instead of __u32 in non-exported kernel code.

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11573): uvcvideo: Prevent invormation loss with removing implicit casting
Márton Németh [Wed, 15 Apr 2009 12:01:58 +0000 (09:01 -0300)] 
V4L/DVB (11573): uvcvideo: Prevent invormation loss with removing implicit casting

The uvcvideo driver supports only one input, which is input 0. For all
other input index the return value shall be EINVAL. This patch fixes the
problem when the value 0x80000000 was incorrectly casted and treated as
a zero value.

The patch was tested with v4l-test 0.10 [2] with CNF7129 webcam found on
EeePC 901.

References:
[1] V4L2 API specification, revision 0.24
    http://v4l2spec.bytesex.org/spec/r11217.htm

[2] v4l-test: Test environment for Video For Linux Two API
    http://v4l-test.sourceforge.net/

[Modified by Laurent Pinchart]

Invalid input value (u32)-1 would be accepted due to integer overflow. Make
sure the driver rejects it and returns -EINVAL.

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11571): Add Elgato EyeTV DTT deluxe to dibcom driver
Armin Schenker [Mon, 20 Apr 2009 14:57:49 +0000 (11:57 -0300)] 
V4L/DVB (11571): Add Elgato EyeTV DTT deluxe to dibcom driver

This patch introduces support for DVB-T for the following dibcom based
card:
Elgato EyeTV DTT deluxe (USB-ID: 0fd9:0020)

Signed-off-by: Armin Schenker <sar@snafu.de>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11569): av7110_hw: fix compile warning
Alexey Klimov [Sun, 19 Apr 2009 20:21:03 +0000 (17:21 -0300)] 
V4L/DVB (11569): av7110_hw: fix compile warning

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11566): remove broken macro from dvb stv0900_priv.h
Mariusz Kozlowski [Sun, 12 Apr 2009 19:58:52 +0000 (16:58 -0300)] 
V4L/DVB (11566): remove broken macro from dvb stv0900_priv.h

It both has unbalanced parentheses and == is not = and it's not used
anywhere anyway.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB: cx231xx: remove unused #include <linux/version.h>'s
Huang Weiyi [Tue, 7 Apr 2009 22:49:46 +0000 (19:49 -0300)] 
V4L/DVB: cx231xx: remove unused #include <linux/version.h>'s

Remove unused #include <linux/version.h>'s in
  drivers/media/video/cx231xx/cx231xx-avcore.c
  drivers/media/video/cx231xx/cx231xx-vbi.c

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11564): tda7432: Delete old driver history
Jean Delvare [Tue, 7 Apr 2009 15:55:17 +0000 (12:55 -0300)] 
V4L/DVB (11564): tda7432: Delete old driver history

The history of changes does belong to git.

In general I wouldn't care too much but it happens that this specific
comment triggers a false positive in one of my scripts, so I'd rather
get rid of it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11549): gspca - m5602-s5k83a: Remove lots of useless init
Erik Andr?n [Tue, 20 Jan 2009 18:02:27 +0000 (15:02 -0300)] 
V4L/DVB (11549): gspca - m5602-s5k83a: Remove lots of useless init

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11548): gspca - m5602-s5k83a: No need to initialize some registers in init
Erik Andr?n [Tue, 20 Jan 2009 17:55:53 +0000 (14:55 -0300)] 
V4L/DVB (11548): gspca - m5602-s5k83a: No need to initialize some registers in init

s5k83a: All v4l2 ctrls are initialized later, no need to set those registers during init.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11547): gspca - m5602-s5k83a: Align the v4l2 ctrl definitions
Erik Andr?n [Tue, 20 Jan 2009 17:53:21 +0000 (14:53 -0300)] 
V4L/DVB (11547): gspca - m5602-s5k83a: Align the v4l2 ctrl definitions

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11546): gspca - m5602-mt9m111: Endianness fixes.
Erik Andr?n [Tue, 20 Jan 2009 17:48:16 +0000 (14:48 -0300)] 
V4L/DVB (11546): gspca - m5602-mt9m111: Endianness fixes.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11545): gspca - m5602-mt9m111: Activate vflip/hflip by default
Erik Andr?n [Tue, 20 Jan 2009 17:32:51 +0000 (14:32 -0300)] 
V4L/DVB (11545): gspca - m5602-mt9m111: Activate vflip/hflip by default

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11544): gspca - m5602-mt9m111: Add experimental QVGA support
Erik Andr?n [Tue, 20 Jan 2009 07:16:28 +0000 (04:16 -0300)] 
V4L/DVB (11544): gspca - m5602-mt9m111: Add experimental QVGA support

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11543): gspca - m5602-mt9m111: Setup VGA resolution
Erik Andr?n [Tue, 20 Jan 2009 07:13:34 +0000 (04:13 -0300)] 
V4L/DVB (11543): gspca - m5602-mt9m111: Setup VGA resolution

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11542): gspca - m5602-mt9m111: Synthesize the hsync/vsync setup
Erik Andr?n [Tue, 20 Jan 2009 07:05:19 +0000 (04:05 -0300)] 
V4L/DVB (11542): gspca - m5602-mt9m111: Synthesize the hsync/vsync setup

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11541): gspca - m5602-mt9m111: Add a start function
Erik Andr?n [Tue, 20 Jan 2009 06:54:51 +0000 (03:54 -0300)] 
V4L/DVB (11541): gspca - m5602-mt9m111: Add a start function

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11540): gspca - m5602-mt9m111: Replace magic constants with defines
Erik Andr?n [Tue, 20 Jan 2009 06:49:00 +0000 (03:49 -0300)] 
V4L/DVB (11540): gspca - m5602-mt9m111: Replace magic constants with defines

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11539): gspca - m5602-ov9650: Be more strict during the hsync/vsync synthesis
Erik Andr?n [Mon, 19 Jan 2009 17:02:28 +0000 (14:02 -0300)] 
V4L/DVB (11539): gspca - m5602-ov9650: Be more strict during the hsync/vsync synthesis

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11538): gscpa - m5602-ov9650: Add defines for some magic constants
Erik Andr?n [Sun, 18 Jan 2009 18:21:07 +0000 (15:21 -0300)] 
V4L/DVB (11538): gscpa - m5602-ov9650: Add defines for some magic constants

Replaces some magic constants with the defines. Remove a couple of bits that should be set later in the process depending on the v4l2 ctrl.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11537): gspca - m5602-po1030: Clear subsampling flag when setting VGA mode
Erik Andr?n [Sun, 18 Jan 2009 14:13:47 +0000 (11:13 -0300)] 
V4L/DVB (11537): gspca - m5602-po1030: Clear subsampling flag when setting VGA mode

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11536): gspca - m5602-po1030: Impove the bridge vsync/hsync configuration
Erik Andr?n [Fri, 16 Jan 2009 06:48:15 +0000 (03:48 -0300)] 
V4L/DVB (11536): gspca - m5602-po1030: Impove the bridge vsync/hsync configuration

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11535): gspca - m5602-po1030: Add experimental QVGA support
Erik Andr?n [Thu, 15 Jan 2009 17:18:36 +0000 (14:18 -0300)] 
V4L/DVB (11535): gspca - m5602-po1030: Add experimental QVGA support

Adds experimental support for QVGA. This is code is compile tested only.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11534): gspca - m5602-po1030: Synthesize the hsync/vsync setup
Erik Andr?n [Thu, 15 Jan 2009 17:05:35 +0000 (14:05 -0300)] 
V4L/DVB (11534): gspca - m5602-po1030: Synthesize the hsync/vsync setup

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11533): gspca - m5602-po1030: Setup window per resolution
Erik Andr?n [Thu, 15 Jan 2009 16:39:39 +0000 (13:39 -0300)] 
V4L/DVB (11533): gspca - m5602-po1030: Setup window per resolution

This patch for the po1030 sets the drawing window for the VGA resolution

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11532): gspca - m5602-po1030: Move some code from the start vector to the...
Erik Andr?n [Thu, 15 Jan 2009 06:52:08 +0000 (03:52 -0300)] 
V4L/DVB (11532): gspca - m5602-po1030: Move some code from the start vector to the init vector

This is a prepatory patch in order to support multiple resolutions for the po1030 sensor

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11531): gspca - m5602-po1030: Clean up some comments
Erik Andr?n [Thu, 15 Jan 2009 06:40:01 +0000 (03:40 -0300)] 
V4L/DVB (11531): gspca - m5602-po1030: Clean up some comments

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11530): gspca - m5602-s5k4aa: Add brightness v4l2 ctrl
Erik Andr?n [Wed, 14 Jan 2009 06:37:03 +0000 (03:37 -0300)] 
V4L/DVB (11530): gspca - m5602-s5k4aa: Add brightness v4l2 ctrl

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11529): gspca - m5602-s5k4aa: Add noise suppression ctrl
Erik Andr?n [Tue, 13 Jan 2009 19:40:28 +0000 (16:40 -0300)] 
V4L/DVB (11529): gspca - m5602-s5k4aa: Add noise suppression ctrl

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11528): gspca - m5602-s5k4aa: Consolidate the gain settings, adjust row...
Erik Andr?n [Tue, 13 Jan 2009 19:24:19 +0000 (16:24 -0300)] 
V4L/DVB (11528): gspca - m5602-s5k4aa: Consolidate the gain settings, adjust row start

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11527): gspca - m5602-s5k4aa: Try to use proper read-modify-write of the...
Erik Andr?n [Tue, 13 Jan 2009 18:44:03 +0000 (15:44 -0300)] 
V4L/DVB (11527): gspca - m5602-s5k4aa: Try to use proper read-modify-write of the vflip/hflip

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11526): gspca - m5602-mt9m111: Add red balance ctrl
Erik Andr?n [Tue, 13 Jan 2009 17:18:53 +0000 (14:18 -0300)] 
V4L/DVB (11526): gspca - m5602-mt9m111: Add red balance ctrl

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11525): gspca - m5602-mt9m111: Add blue balance ctrl
Erik Andr?n [Tue, 13 Jan 2009 17:16:03 +0000 (14:16 -0300)] 
V4L/DVB (11525): gspca - m5602-mt9m111: Add blue balance ctrl

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11524): gspca - m5602-mt9m111: Add green balance ctrl
Erik Andr?n [Tue, 13 Jan 2009 17:10:44 +0000 (14:10 -0300)] 
V4L/DVB (11524): gspca - m5602-mt9m111: Add green balance ctrl

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11523): gspca - m5602-po1030: Add private green balance control
Erik Andr?n [Tue, 13 Jan 2009 16:55:52 +0000 (13:55 -0300)] 
V4L/DVB (11523): gspca - m5602-po1030: Add private green balance control

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11522): gspca - m5602-po1030: Add auto exposure control
Erik Andr?n [Tue, 13 Jan 2009 16:43:46 +0000 (13:43 -0300)] 
V4L/DVB (11522): gspca - m5602-po1030: Add auto exposure control

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11521): gspca - m5602-ov9650: Add auto exposure ctrl
Erik Andr?n [Tue, 13 Jan 2009 06:57:57 +0000 (03:57 -0300)] 
V4L/DVB (11521): gspca - m5602-ov9650: Add auto exposure ctrl

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11520): gspca - m5602-po1030: Remove redundant init sequences
Erik Andr?n [Tue, 13 Jan 2009 06:46:24 +0000 (03:46 -0300)] 
V4L/DVB (11520): gspca - m5602-po1030: Remove redundant init sequences

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11517): v4l: remove driver-core BUS_ID_SIZE
Kay Sievers [Thu, 16 Apr 2009 16:30:38 +0000 (13:30 -0300)] 
V4L/DVB (11517): v4l: remove driver-core BUS_ID_SIZE

The name size limit is gone from the driver core, the BUS_ID_SIZE
value will be removed.

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11492): af9015: support for Conceptronic USB2.0 DVB-T CTVDIGRCU V3.0
Marcel Jueling [Thu, 9 Apr 2009 20:16:41 +0000 (17:16 -0300)] 
V4L/DVB (11492): af9015: support for Conceptronic USB2.0 DVB-T CTVDIGRCU V3.0

Add USB ID (1b80:e397) for Conceptronic USB2.0 DVB-T CTVDIGRCU V3.0.

Signed-off-by: Marcel Jueling <Marcel@Jueling.de>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11491): af9015: support for AverMedia AVerTV Volar GPS 805 (A805)
Antti Palosaari [Thu, 9 Apr 2009 18:14:18 +0000 (15:14 -0300)] 
V4L/DVB (11491): af9015: support for AverMedia AVerTV Volar GPS 805 (A805)

Add USB ID (07ca:a805) for AverMedia AVerTV Volar GPS 805 (A805).
Thanks to Chris Brown <chrisneilbrown@gmail.com> for reporting and
testing.

Tested-by: Chris Brown <chrisneilbrown@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11490): af9015: add new dvb_usb_device_properties entry for upcoming USB IDs
Antti Palosaari [Thu, 9 Apr 2009 12:16:12 +0000 (09:16 -0300)] 
V4L/DVB (11490): af9015: add new dvb_usb_device_properties entry for upcoming USB IDs

Add 3rd dvb_usb_device_properties entry for upcoming USB IDs because
current entries are full.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11488): get_dvb_firmware: trivial url change
Joseba Goitia Gandiaga [Thu, 9 Apr 2009 21:29:16 +0000 (18:29 -0300)] 
V4L/DVB (11488): get_dvb_firmware: trivial url change

Trivial url changes in script

Signed-off-by: Joseba Goitia Gandiaga <josebagg@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11487): em28xx: fix typo em28xx_errdev message
Filipe Rosset [Thu, 9 Apr 2009 21:27:12 +0000 (18:27 -0300)] 
V4L/DVB (11487): em28xx: fix typo em28xx_errdev message

Fix typo usbtransfer->usb transfer on em28xx_errdev message.

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11486): em28xx: Add EmpireTV board support
Douglas Schilling Landgraf [Thu, 9 Apr 2009 21:24:34 +0000 (18:24 -0300)] 
V4L/DVB (11486): em28xx: Add EmpireTV board support

Added EmpireTV entry.
Thanks to Xwang <xwang1976@email.it> to provide data for this board.

Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11483): gspca - mr97310a: Webcam 093a:010f added.
Theodore Kilgore [Sun, 5 Apr 2009 18:36:04 +0000 (15:36 -0300)] 
V4L/DVB (11483): gspca - mr97310a: Webcam 093a:010f added.

Signed-off-by: Theodore Kilgore <kilgota@auburn.edu>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11482): gspca - m5602-mt9m111: Remove lots of redundant init code
Erik Andr?n [Mon, 12 Jan 2009 17:17:05 +0000 (14:17 -0300)] 
V4L/DVB (11482): gspca - m5602-mt9m111: Remove lots of redundant init code

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11481): gspca - m5602-mt9m111: More constant replacement
Erik Andr?n [Mon, 12 Jan 2009 17:00:51 +0000 (14:00 -0300)] 
V4L/DVB (11481): gspca - m5602-mt9m111: More constant replacement

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11480): gspca - m5602-mt9m111: Remove lots of redundant sensor reads
Erik Andr?n [Mon, 12 Jan 2009 16:56:13 +0000 (13:56 -0300)] 
V4L/DVB (11480): gspca - m5602-mt9m111: Remove lots of redundant sensor reads

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11479): gspca - m5602-mt9m111: More magic constants replacement
Erik Andr?n [Mon, 12 Jan 2009 16:50:29 +0000 (13:50 -0300)] 
V4L/DVB (11479): gspca - m5602-mt9m111: More magic constants replacement

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11478): gspca - m5602-mt9m111: Replace various magic constants with defines
Erik Andr?n [Mon, 12 Jan 2009 16:43:42 +0000 (13:43 -0300)] 
V4L/DVB (11478): gspca - m5602-mt9m111: Replace various magic constants with defines

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11477): gspca - m5602-po1030: Set the blue balance in the init not red balan...
Erik Andr?n [Sun, 11 Jan 2009 18:23:46 +0000 (15:23 -0300)] 
V4L/DVB (11477): gspca - m5602-po1030: Set the blue balance in the init not red balance twice

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11476): gspca - m5602: Add some more register defines
Erik Andr?n [Sun, 11 Jan 2009 16:39:41 +0000 (13:39 -0300)] 
V4L/DVB (11476): gspca - m5602: Add some more register defines

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11475): gspca - m5602-po1030: Lower the default blue and gain balance
Erik Andr?n [Sun, 11 Jan 2009 16:00:15 +0000 (13:00 -0300)] 
V4L/DVB (11475): gspca - m5602-po1030: Lower the default blue and gain balance

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11474): gspca - m5602-po1030: Fix sensor probing.
Erik Andr?n [Sun, 11 Jan 2009 15:52:10 +0000 (12:52 -0300)] 
V4L/DVB (11474): gspca - m5602-po1030: Fix sensor probing.

The po1030 read sensor are currently returning the contents of the address+1 fix the probing of the sensor to cope with this. Obviously this needs to be tracked down and fixed.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11473): gspca - m5602-po1030: Release reset when init is done.
Erik Andr?n [Sun, 11 Jan 2009 15:46:51 +0000 (12:46 -0300)] 
V4L/DVB (11473): gspca - m5602-po1030: Release reset when init is done.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11472): gspca - m5602-mt9m111: Remove lots of redundant init code
Erik Andr?n [Sat, 10 Jan 2009 13:55:07 +0000 (10:55 -0300)] 
V4L/DVB (11472): gspca - m5602-mt9m111: Remove lots of redundant init code

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11471): gspca - m5602-mt9m111: Remove more redundant init
Erik Andr?n [Fri, 9 Jan 2009 17:10:19 +0000 (14:10 -0300)] 
V4L/DVB (11471): gspca - m5602-mt9m111: Remove more redundant init

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11470): gspca - m5602-mt9m111: Implement an auto white balancing control
Erik Andr?n [Fri, 9 Jan 2009 17:03:27 +0000 (14:03 -0300)] 
V4L/DVB (11470): gspca - m5602-mt9m111: Implement an auto white balancing control

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11469): gspca - m5602-mt9m111: More redundant init cleanup
Erik Andr?n [Fri, 9 Jan 2009 16:53:20 +0000 (13:53 -0300)] 
V4L/DVB (11469): gspca - m5602-mt9m111: More redundant init cleanup

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11468): gspca - m5602-mt9m111: Remove redundant init sequences
Erik Andr?n [Fri, 9 Jan 2009 16:41:28 +0000 (13:41 -0300)] 
V4L/DVB (11468): gspca - m5602-mt9m111: Remove redundant init sequences

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11467): gspca - m5602: Move all dump_sensor to the init function
Erik Andr?n [Fri, 9 Jan 2009 16:35:00 +0000 (13:35 -0300)] 
V4L/DVB (11467): gspca - m5602: Move all dump_sensor to the init function

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11466): gspca - m5602: Let all ctrls on all sensors be static
Erik Andr?n [Fri, 3 Apr 2009 05:49:10 +0000 (02:49 -0300)] 
V4L/DVB (11466): gspca - m5602: Let all ctrls on all sensors be static

All hail the static keyword

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11465): gspca - m5602-s5k4aa: Set all v4l2 ctrls on sensor init.
Erik Andr?n [Fri, 9 Jan 2009 06:30:54 +0000 (03:30 -0300)] 
V4L/DVB (11465): gspca - m5602-s5k4aa: Set all v4l2 ctrls on sensor init.

Reset all v4l2 ctrls on the s5k4aa init. The prevents all ctrls to be reset
during resume from ram.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11464): gspca - m5602-mt9m111: Set the cached v4l2 ctrl values
Erik Andr?n [Thu, 8 Jan 2009 21:11:05 +0000 (18:11 -0300)] 
V4L/DVB (11464): gspca - m5602-mt9m111: Set the cached v4l2 ctrl values

When we resume the machine we want the previously set values, not the default
values. Fix this for the mt9m111 sensor

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11463): gspca - m5602-po1030: Remove unneeded init sequences
Erik Andr?n [Thu, 8 Jan 2009 17:22:51 +0000 (14:22 -0300)] 
V4L/DVB (11463): gspca - m5602-po1030: Remove unneeded init sequences

po1030: There's a lot of redundant writes to the bridge and sensor.
Remove them.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11462): gspca - m5602-po1030: Split up the init into init and start
Erik Andr?n [Thu, 8 Jan 2009 17:15:06 +0000 (14:15 -0300)] 
V4L/DVB (11462): gspca - m5602-po1030: Split up the init into init and start

Split up the po1030 init into start and init. Add a start function.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11461): gspca - m5602-po1030: Probe read only register at probe time
Erik Andr?n [Thu, 8 Jan 2009 07:04:19 +0000 (04:04 -0300)] 
V4L/DVB (11461): gspca - m5602-po1030: Probe read only register at probe time

Currently, we're probing r/w registers at probe time.
This is potentially dangerous, probe some read only registers instead.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11460): gspca - m5602-po1030: Remove unnecessary error check
Erik Andr?n [Thu, 8 Jan 2009 07:01:23 +0000 (04:01 -0300)] 
V4L/DVB (11460): gspca - m5602-po1030: Remove unnecessary error check

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11459): gspca - m5602-po1030: Add auto white balancing control
Erik Andr?n [Thu, 8 Jan 2009 06:53:50 +0000 (03:53 -0300)] 
V4L/DVB (11459): gspca - m5602-po1030: Add auto white balancing control

Add a po1030 auto white balancing control that's disabled by default

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11458): gspca - m5602-po1030: Set all v4l2 controls at sensor init
Erik Andr?n [Wed, 7 Jan 2009 21:05:08 +0000 (18:05 -0300)] 
V4L/DVB (11458): gspca - m5602-po1030: Set all v4l2 controls at sensor init

Previously many of the v4l2 ctrls were set to their initial values at resume from ram/disk. This patch enforces the values stored in the ctrl cache.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11457): gspca - m5602-po1030: Simplify register defines
Erik Andr?n [Wed, 7 Jan 2009 20:41:47 +0000 (17:41 -0300)] 
V4L/DVB (11457): gspca - m5602-po1030: Simplify register defines

This patch renames some register defines in the ov9650 sensor.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11456): gspca - m5602-po1030: Rename register defines, add missing ones.
Erik Andr?n [Wed, 7 Jan 2009 16:54:13 +0000 (13:54 -0300)] 
V4L/DVB (11456): gspca - m5602-po1030: Rename register defines, add missing ones.

The po1030 register defines are unnecessarily complex, simplify them and also add some missing ones.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11455): gspca - m5602-ov9650: Improve the vflip quirk handling.
Erik Andr?n [Tue, 6 Jan 2009 15:58:50 +0000 (12:58 -0300)] 
V4L/DVB (11455): gspca - m5602-ov9650: Improve the vflip quirk handling.

Regardless of the actual sensor orientation vflip = 0 is normal, and vflip = 1 is upside down. This patch makes that happen

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11454): gspca - m5602-mt9m111: Remove the unused power_down struct member
Erik Andr?n [Tue, 6 Jan 2009 14:59:42 +0000 (11:59 -0300)] 
V4L/DVB (11454): gspca - m5602-mt9m111: Remove the unused power_down struct member

The power_down sensor struct member is almost has no purpose in the current driver abstraction. Remove it.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11453): gspca - m5602-s5k4aa: Convert to use the v4l2 ctrl cache
Erik Andr?n [Tue, 6 Jan 2009 14:37:03 +0000 (11:37 -0300)] 
V4L/DVB (11453): gspca - m5602-s5k4aa: Convert to use the v4l2 ctrl cache

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11452): gspca - m5602-po1030: Convert to have a v4l2 ctrl cache
Erik Andr?n [Tue, 6 Jan 2009 09:39:11 +0000 (06:39 -0300)] 
V4L/DVB (11452): gspca - m5602-po1030: Convert to have a v4l2 ctrl cache

Let the po1030 have a local v4l2 ctrl cache as this minimizes the load on reading the registers and improves performance.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11451): gspca - m5602-s5k83a: Add rotation, ctrl cache. Rename some ctrls.
Luk?? Karas [Fri, 3 Apr 2009 05:45:56 +0000 (02:45 -0300)] 
V4L/DVB (11451): gspca - m5602-s5k83a: Add rotation, ctrl cache. Rename some ctrls.

s5k83a sensor mounted on many acer laptops have a swiwel allowing it to be rotated. When the camera is in its rotated state, the image needs to be flipped. The only way to check for if the camera has been flipped is to continously poll a register in the m5602. This patch creates a kernel thread which does this. This patch renames some v4l2 ctrls and finally implements a cache in order to prevent unnecessary sensor reads.

Signed-off-by: Luk?? Karas <lukas.karas@centrum.cz>
Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11450): gspca - m5602-mt9m111: Convert the mt9m111 to use a v4l2 ctrl cache
Erik Andr?n [Sun, 4 Jan 2009 19:52:48 +0000 (16:52 -0300)] 
V4L/DVB (11450): gspca - m5602-mt9m111: Convert the mt9m111 to use a v4l2 ctrl cache

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11449): gspca - zc3xx: Bad probe of many webcams since adcm2700 addition.
Jean-Francois Moine [Sun, 5 Apr 2009 07:01:13 +0000 (04:01 -0300)] 
V4L/DVB (11449): gspca - zc3xx: Bad probe of many webcams since adcm2700 addition.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11448): gspca - main: Use usb interface as parent.
Hans de Goede [Fri, 27 Mar 2009 19:08:20 +0000 (16:08 -0300)] 
V4L/DVB (11448): gspca - main: Use usb interface as parent.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11447): gspca - mr97310a: Return good error code in mod_init.
Alexey Klimov [Fri, 27 Mar 2009 18:57:46 +0000 (15:57 -0300)] 
V4L/DVB (11447): gspca - mr97310a: Return good error code in mod_init.

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoV4L/DVB (11446): gspca - t613: Do sensor reset only for sensor om6802.
Jean-Francois Moine [Thu, 12 Mar 2009 07:40:19 +0000 (04:40 -0300)] 
V4L/DVB (11446): gspca - t613: Do sensor reset only for sensor om6802.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
15 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
Linus Torvalds [Tue, 16 Jun 2009 19:11:57 +0000 (12:11 -0700)] 
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2/net: Use wait_event() in o2net_send_message_vec()
  ocfs2: Adjust rightmost path in ocfs2_add_branch.
  ocfs2: fdatasync should skip unimportant metadata writeout
  ocfs2: Remove redundant gotos in ocfs2_mount_volume()
  ocfs2: Add statistics for the checksum and ecc operations.
  ocfs2 patch to track delayed orphan scan timer statistics
  ocfs2: timer to queue scan of all orphan slots
  ocfs2: Correct ordering of ip_alloc_sem and localloc locks for directories
  ocfs2: Fix possible deadlock in quota recovery
  ocfs2: Fix possible deadlock with quotas in ocfs2_setattr()
  ocfs2: Fix lock inversion in ocfs2_local_read_info()
  ocfs2: Fix possible deadlock in ocfs2_global_read_dquot()
  ocfs2: update comments in masklog.h
  ocfs2: Don't printk the error when listing too many xattrs.

15 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Tue, 16 Jun 2009 19:10:31 +0000 (12:10 -0700)] 
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: intel8x0 - Fix PCM position craziness
  ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII
  ASoC: magician: fix PXA SSP clock polarity
  ASoC: Instantiate any forgotten DAPM widgets
  ASoC: Revert duplicated code in SSM2602 driver
  ALSA: hda - Add quirk for Acer Aspire 6935G
  ALSA: ctxfi - Replace atc lock to mutex
  ASoC: Remove odd bit clock ratios for WM8903

15 years agoMerge branch 'serial'
Linus Torvalds [Tue, 16 Jun 2009 19:03:43 +0000 (12:03 -0700)] 
Merge branch 'serial'

* serial:
  imx: Check for NULL pointer deref before calling tty_encode_baud_rate
  atmel_serial: fix hang in set_termios when crtscts is enabled
  MAINTAINERS: update 8250 section, give Alan Cox a name
  tty: fix sanity check
  pty: Narrow the race on ldisc locking
  tty: fix unused warning when TCGETX is not defined
  ldisc: debug aids
  ldisc: Make sure the ldisc isn't active when we close it
  tty: Fix leaks introduced by the shift to separate ldisc objects

Fix conflicts in drivers/char/pty.c due to earlier version of the ldisc
race narrowing.