pandora-kernel.git
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.

15 years agoimx: Check for NULL pointer deref before calling tty_encode_baud_rate
Sascha Hauer [Tue, 16 Jun 2009 16:02:15 +0000 (17:02 +0100)]
imx: Check for NULL pointer deref before calling tty_encode_baud_rate

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoatmel_serial: fix hang in set_termios when crtscts is enabled
Haavard Skinnemoen [Tue, 16 Jun 2009 16:02:03 +0000 (17:02 +0100)]
atmel_serial: fix hang in set_termios when crtscts is enabled

After enabling hardware flow control, any subsequent termios call may hang
waiting for the transmitter to drain.  This appears to be caused by a
busy-loop in set_termios() waiting for the transmitter to become empty,
which may take a very long time (or hang indefinitely) if the device at
the other end is blocking us.

A quick look through the tty and serial_core code indicates that any
necessary flushing (which is optional) has already been done at this
point, so there's no need for the driver to flush the transmitter on its
own.

Fix it by removing the busy-loop altogether.

Tested-by: Eirik Aanonsen <eaa@wprmedical.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoMAINTAINERS: update 8250 section, give Alan Cox a name
Joe Perches [Tue, 16 Jun 2009 16:01:52 +0000 (17:01 +0100)]
MAINTAINERS: update 8250 section, give Alan Cox a name

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agotty: fix sanity check
Alan Cox [Tue, 16 Jun 2009 16:01:33 +0000 (17:01 +0100)]
tty: fix sanity check

The WARN_ON() that was added to tty_reopen can be triggered in the specific
case of a hangup occurring during a re-open of a tty which is not in the
middle of being otherwise closed.

In that case however the WARN() is bogus as we don't hold the neccessary
locks to make a correct decision.

The case we should be checking is "if the ldisc is not changing and reopen
is occuring". We could drop the WARN_ON but for the moment the debug is more
valuable even if it means taking a mutex as it will find any other cases.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agopty: Narrow the race on ldisc locking
Alan Cox [Tue, 16 Jun 2009 16:01:13 +0000 (17:01 +0100)]
pty: Narrow the race on ldisc locking

The pty code has always been buggy on its ldisc handling. The recent
changes made the window for the race much bigger. Pending fixing it
properly which is not at all trivial, at least make the race small again so
we don't disrupt other dev work.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agotty: fix unused warning when TCGETX is not defined
Mike Frysinger [Tue, 16 Jun 2009 16:01:02 +0000 (17:01 +0100)]
tty: fix unused warning when TCGETX is not defined

If TCGETX is not defined, we end up with this warning:
drivers/char/tty_ioctl.c: In function ‘tty_mode_ioctl’:
drivers/char/tty_ioctl.c:950: warning: unused variable ‘ktermx’

Since the variable is only used in one case statement, push it down to
the local case scope.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoldisc: debug aids
Alan Cox [Tue, 16 Jun 2009 16:00:53 +0000 (17:00 +0100)]
ldisc: debug aids

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoldisc: Make sure the ldisc isn't active when we close it
Alan Cox [Tue, 16 Jun 2009 16:00:40 +0000 (17:00 +0100)]
ldisc: Make sure the ldisc isn't active when we close it

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agotty: Fix leaks introduced by the shift to separate ldisc objects
Alan Cox [Tue, 16 Jun 2009 16:00:26 +0000 (17:00 +0100)]
tty: Fix leaks introduced by the shift to separate ldisc objects

Gold star for the kmemleak detector.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
Linus Torvalds [Tue, 16 Jun 2009 18:52:41 +0000 (11:52 -0700)]
Merge git://git./linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (30 commits)
  sparc64: Update defconfig.
  sparc: Wire up sys_rt_tgsigqueueinfo().
  openprom: Squelch useless GCC warning.
  sparc: replace uses of CPU_MASK_ALL_PTR
  sparc64: Add proper dynamic ftrace support.
  sparc: Simplify code using is_power_of_2() routine.
  sparc: move of_device common code to of_device_common
  sparc: remove dma-mapping_{32|64}.h
  sparc: use dma_map_page instead of dma_map_single
  sparc: add sync_single_for_device and sync_sg_for_device to struct dma_ops
  sparc: move the duplication in dma-mapping_{32|64}.h to dma-mapping.h
  p9100: use standard fields for framebuffer physical address and length
  leo: use standard fields for framebuffer physical address and length
  cg6: use standard fields for framebuffer physical address and length
  cg3: use standard fields for framebuffer physical address and length
  cg14: use standard fields for framebuffer physical address and length
  bw2: use standard fields for framebuffer physical address and length
  sparc64: fix and optimize irq distribution
  sparc64: Use new dynamic per-cpu allocator.
  sparc64: Only allocate per-cpu areas for possible cpus.
  ...

15 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
Linus Torvalds [Tue, 16 Jun 2009 18:49:58 +0000 (11:49 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (27 commits)
  Blackfin: hook up new rt_tgsigqueueinfo syscall
  Blackfin: improve CLKIN_HZ config default
  Blackfin: initial support for ftrace grapher
  Blackfin: initial support for ftrace
  Blackfin: enable support for LOCKDEP
  Blackfin: add preliminary support for STACKTRACE
  Blackfin: move custom sections into sections.h
  Blackfin: punt unused/wrong mutex-dec.h
  Blackfin: add support for irqflags
  Blackfin: add support for bzip2/lzma compressed kernel images
  Blackfin: convert Kconfig style to def_bool
  Blackfin: bf548-ezkit: update smsc911x resources
  Blackfin: update aedos-ipipe code to upstream 1.10-00
  Blackfin: bf537-stamp: update ADP5520 resources
  Blackfin: bf518f-ezbrd: fix SPI CS for SPI flash
  Blackfin: define SPI IRQ in board resources
  Blackfin: do not configure the UART early if on wrong processor
  Blackfin: fix deadlock in SMP IPI handler
  Blackfin: fix flag storage for irq funcs
  Blackfin: push down exception oops checking
  ...

15 years agoMerge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
Linus Torvalds [Tue, 16 Jun 2009 18:48:13 +0000 (11:48 -0700)]
Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (33 commits)
  [S390] s390: hibernation support for s390
  [S390] pm: dcssblk power management callbacks.
  [S390] pm: monreader power management callbacks.
  [S390] pm: monwriter power management callbacks.
  [S390] pm: memory hotplug power management callbacks
  [S390] pm: con3270 power management callbacks.
  [S390] pm: smsgiucv power management callbacks.
  [S390] pm: hvc_iucv power management callbacks
  [S390] PM: af_iucv power management callbacks.
  [S390] pm: netiucv power management callbacks.
  [S390] pm: iucv power management callbacks.
  [S390] iucv: establish reboot notifier
  [S390] pm: power management support for SCLP drivers.
  [S390] pm: tape power management callbacks
  [S390] pm: vmlogrdr power management callbacks
  [S390] pm: vmur driver power management callbacks
  [S390] pm: appldata power management callbacks
  [S390] pm: vmwatchdog power management callbacks.
  [S390] pm: zfcp driver power management callbacks
  [S390] pm: claw driver power management callbacks
  ...

15 years agoMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Tue, 16 Jun 2009 18:46:45 +0000 (11:46 -0700)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: remove some includings of blktrace_api.h
  mg_disk: seperate mg_disk.h again
  block: Introduce helper to reset queue limits to default values
  cfq: remove extraneous '\n' in blktrace output
  ubifs: register backing_dev_info
  btrfs: properly register fs backing device
  block: don't overwrite bdi->state after bdi_init() has been run
  cfq: cleanup for last_end_request in cfq_data

15 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Linus Torvalds [Tue, 16 Jun 2009 18:30:37 +0000 (11:30 -0700)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (38 commits)
  ps3flash: Always read chunks of 256 KiB, and cache them
  ps3flash: Cache the last accessed FLASH chunk
  ps3: Replace direct file operations by callback
  ps3: Switch ps3_os_area_[gs]et_rtc_diff to EXPORT_SYMBOL_GPL()
  ps3: Correct debug message in dma_ioc0_map_pages()
  drivers/ps3: Add missing annotations
  ps3fb: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata
  ps3: Use dev_[gs]et_drvdata() instead of direct access for system bus devices
  block/ps3: remove driver_data direct access of struct device
  ps3vram: Make ps3vram_priv.reports a void *
  ps3vram: Remove no longer used ps3vram_priv.ddr_base
  ps3vram: Replace mutex by spinlock + bio_list
  block: Add bio_list_peek()
  powerpc: Use generic atomic64_t implementation on 32-bit processors
  lib: Provide generic atomic64_t implementation
  powerpc: Add compiler memory barrier to mtmsr macro
  powerpc/iseries: Mark signal_vsp_instruction() as maybe unused
  powerpc/iseries: Fix unused function warning in iSeries DT code
  ...

15 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Linus Torvalds [Tue, 16 Jun 2009 18:30:16 +0000 (11:30 -0700)]
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: always update root items for fs trees at commit time

15 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
Linus Torvalds [Tue, 16 Jun 2009 18:29:44 +0000 (11:29 -0700)]
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: split fat_generic_ioctl
  FAT: add 'errors' mount option

15 years agoMerge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
Linus Torvalds [Tue, 16 Jun 2009 18:29:17 +0000 (11:29 -0700)]
Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  therm_windtunnel: Convert to a new-style i2c driver
  therm_adt746x: Convert to a new-style i2c driver
  windfarm: Convert to new-style i2c drivers
  therm_pm72: Convert to a new-style i2c driver
  i2c-viapro: Add new PCI device ID for VX855
  i2c/chips: Move max6875 to drivers/misc/eeprom
  i2c: Do not give adapters a default parent
  i2c: Do not probe for TV chips on Voodoo3 adapters
  i2c: Retry automatically on arbitration loss
  i2c: Remove void casts

15 years agoMerge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
Linus Torvalds [Tue, 16 Jun 2009 18:28:50 +0000 (11:28 -0700)]
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (max6650) Add support for alarms
  hwmon: (f71882fg) Add support for the F71858F
  hwmon: (f71882fg) Add temp#_fault sysfs attr for f8000
  hwmon: (f71882fg) Sanity check f8000 pwm settings
  hwmon: (f71882fg) Cleanup f8000 pwm handling
  hwmon: PCI quirk for hwmon access on MSI MS-7031 board
  hwmon: (w83627ehf) Add W83627DHG-P support
  hwmon: (tmp401) Add documentation
  hwmon: (tmp401) Add support for TI's TMP411 sensors chip
  hwmon: (tmp401) Add support for TI's TMP401 sensor chip
  hwmon: (ibmaem) Automatically load on HC10 blade
  hwmon: Fix more __devexit_p glitches

15 years agoMerge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Tue, 16 Jun 2009 18:24:23 +0000 (11:24 -0700)]
Merge branch 'acpica' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
  ACPICA: Update version to 20090521.
  ACPICA: Disable preservation of SCI enable bit (SCI_EN)
  ACPICA: Region deletion: Ensure region object is removed from handler list
  ACPICA: Eliminate extra call to NsGetParentNode
  ACPICA: Simplify internal operation region interface
  ACPICA: Update Load() to use operation region interfaces
  ACPICA: New: AcpiInstallMethod - install a single control method
  ACPICA: Invalidate DdbHandle after table unload
  ACPICA: Fix reference count issues for DdbHandle object
  ACPICA: Simplify and optimize NsGetNextNode function
  ACPICA: Additional validation of _PRT packages (resource mgr)
  ACPICA: Fix DebugObject output for DdbHandle objects
  ACPICA: Fix allowable release order for ASL mutex objects
  ACPICA: Mutex support: Fix release ordering issue and current sync level
  ACPICA: Update version to 20090422.
  ACPICA: Linux OSL: cleanup/update/merge
  ACPICA: Fix implementation of AML BreakPoint operator (break to debugger)
  ACPICA: Fix miscellaneous warnings under gcc 4+
  ACPICA: Miscellaneous lint changes
  ACPICA: Fix possible dereference of null pointer
  ...

15 years agotty: Fix leaks introduced by the shift to separate ldisc objects
Alan Cox [Mon, 15 Jun 2009 15:28:29 +0000 (16:28 +0100)]
tty: Fix leaks introduced by the shift to separate ldisc objects

Gold star for the kmemleak detector.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agopty: Narrow the race on ldisc locking
Alan Cox [Mon, 15 Jun 2009 15:27:29 +0000 (16:27 +0100)]
pty: Narrow the race on ldisc locking

The pty code has always been buggy on its ldisc handling. The recent
changes made the window for the race much bigger. Pending fixing it
properly which is not at all trivial, at least make the race small again so
we don't disrupt other dev work.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoprintk: add KERN_DEFAULT loglevel to print_modules()
Linus Torvalds [Tue, 16 Jun 2009 18:07:14 +0000 (11:07 -0700)]
printk: add KERN_DEFAULT loglevel to print_modules()

Several WARN_ON() messages omit the '\n' at the end of the string, which
is a simple (and understandable) error.  The next line printed after
that warning line is usually the current module list, and that printk
does not have a log-level marker - resulting in one long mixed-up line.

Adding this loglevel marker will now avoid this unreadable mess.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoprintk: Add KERN_DEFAULT printk log-level
Linus Torvalds [Tue, 16 Jun 2009 18:02:28 +0000 (11:02 -0700)]
printk: Add KERN_DEFAULT printk log-level

This adds a KERN_DEFAULT loglevel marker, for when you cannot decide
which loglevel you want, and just want to keep an existing printk
with the default loglevel.

The difference between having KERN_DEFAULT and having no log-level
marker at all is two-fold:

 - having the log-level marker will now force a new-line if the
   previous printout had not added one (perhaps because it forgot,
   but perhaps because it expected a continuation)

 - having a log-level marker is required if you are printing out a
   message that otherwise itself could perhaps otherwise be mistaken
   for a log-level.

Signed-of-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoprintk: clean up handling of log-levels and newlines
Linus Torvalds [Tue, 16 Jun 2009 17:57:02 +0000 (10:57 -0700)]
printk: clean up handling of log-levels and newlines

It used to be that we would only look at the log-level in a printk()
after explicit newlines, which can cause annoying problems when the
previous printk() did not end with a '\n'. In that case, the log-level
marker would be just printed out in the middle of the line, and be
seen as just noise rather than change the logging level.

This changes things to always look at the log-level in the first
bytes of the printout. If a log level marker is found, it is always
used as the log-level. Additionally, if no newline existed, one is
added (unless the log-level is the explicit KERN_CONT marker, to
explicitly show that it's a continuation of a previous line).

Acked-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
15 years agoMerge branch 'topic/usb-audio' into for-linus
Takashi Iwai [Tue, 16 Jun 2009 15:38:50 +0000 (17:38 +0200)]
Merge branch 'topic/usb-audio' into for-linus

* topic/usb-audio:
  ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII

15 years agoMerge branch 'topic/intel8x0' into for-linus
Takashi Iwai [Tue, 16 Jun 2009 15:38:46 +0000 (17:38 +0200)]
Merge branch 'topic/intel8x0' into for-linus

* topic/intel8x0:
  ALSA: intel8x0 - Fix PCM position craziness

15 years agoMerge branch 'topic/hda' into for-linus
Takashi Iwai [Tue, 16 Jun 2009 15:38:43 +0000 (17:38 +0200)]
Merge branch 'topic/hda' into for-linus

* topic/hda:
  ALSA: hda - Add quirk for Acer Aspire 6935G

15 years agoMerge branch 'topic/ctxfi' into for-linus
Takashi Iwai [Tue, 16 Jun 2009 15:38:40 +0000 (17:38 +0200)]
Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: ctxfi - Replace atc lock to mutex

15 years agoMerge branch 'topic/asoc' into for-linus
Takashi Iwai [Tue, 16 Jun 2009 15:38:36 +0000 (17:38 +0200)]
Merge branch 'topic/asoc' into for-linus

* topic/asoc:
  ASoC: magician: fix PXA SSP clock polarity
  ASoC: Instantiate any forgotten DAPM widgets
  ASoC: Revert duplicated code in SSM2602 driver
  ASoC: Remove odd bit clock ratios for WM8903

15 years agosparc64: Update defconfig.
David S. Miller [Tue, 16 Jun 2009 11:59:53 +0000 (04:59 -0700)]
sparc64: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>