pandora-kernel.git
13 years ago[media] i2c: Remove obsolete cleanup for clientdata
Wolfram Sang [Wed, 10 Nov 2010 12:28:19 +0000 (09:28 -0300)]
[media] i2c: Remove obsolete cleanup for clientdata

A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit. This is obsolete meanwhile, so fix it and hope the word will spread.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] media: video: do not clear 'driver' from an i2c_client
Wolfram Sang [Wed, 10 Nov 2010 14:14:13 +0000 (11:14 -0300)]
[media] media: video: do not clear 'driver' from an i2c_client

The i2c-core does this already.

Reported-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] cx231xx-417: Remove unnecessary casts of void ptr returning alloc function...
Jesper Juhl [Mon, 8 Nov 2010 23:08:41 +0000 (20:08 -0300)]
[media] cx231xx-417: Remove unnecessary casts of void ptr returning alloc function return values

Hi,

The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.

This patch removes such casts from drivers/media/

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] timblogiw: fix kconfig & build error
Randy Dunlap [Wed, 24 Nov 2010 19:41:09 +0000 (16:41 -0300)]
[media] timblogiw: fix kconfig & build error

timblogiw uses dma() interfaces and it selects TIMB_DMA for that
support.  However, drivers/dma/ is not built unless
CONFIG_DMA_ENGINE is enabled, so select/enable that symbol also.

drivers/built-in.o: In function `timblogiw_close':
timblogiw.c:(.text+0x4419fe): undefined reference to `dma_release_channel'
drivers/built-in.o: In function `buffer_release':
timblogiw.c:(.text+0x441a8d): undefined reference to `dma_sync_wait'
drivers/built-in.o: In function `timblogiw_open':
timblogiw.c:(.text+0x44212b): undefined reference to `__dma_request_channel'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] mfd: Add timberdale video-in driver to timberdale
Richard Röjfors [Mon, 8 Nov 2010 13:45:48 +0000 (10:45 -0300)]
[media] mfd: Add timberdale video-in driver to timberdale

This patch defines platform data for the video-in driver
and adds it to all configurations of timberdale.

Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] media: Add timberdale video-in driver
Richard Röjfors [Mon, 8 Nov 2010 13:45:44 +0000 (10:45 -0300)]
[media] media: Add timberdale video-in driver

This patch adds the timberdale video-in driver.

The video IP of timberdale delivers the video data via DMA.
The driver uses the DMA api to handle DMA transfers, and make use
of the V4L2 video buffers to handle buffers against user space.

If available the driver uses an encoder to get/set the video standard

Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] drivers/staging/cx25821: Use pr_fmt and pr_<level>
Joe Perches [Sun, 7 Nov 2010 20:48:21 +0000 (17:48 -0300)]
[media] drivers/staging/cx25821: Use pr_fmt and pr_<level>

Fix several defects with bad line continuation uses that
introduce whitespace.
Fix several defects with lines missing "\n".
Standardize prefixes via pr_fmt.
Remove internal cx25821 prefixes.
Standardize :%s():" ... __func__ uses.
Coalesce long formats.
Add KERN_<level> prefixes via pr_<level> to printks.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] IX2505V: i2c transfer error code ignored
Matthias Schwarzott [Sun, 7 Nov 2010 13:57:13 +0000 (10:57 -0300)]
[media] IX2505V: i2c transfer error code ignored

It seems that ix2505v driver ignores a i2c error in ix2505v_read_status_reg.
This looks like a typing error using (ret = 1) instead of correct (ret == 1).

Acked-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] TM6000: Drop unused macro
Jean Delvare [Sun, 7 Nov 2010 15:54:39 +0000 (12:54 -0300)]
[media] TM6000: Drop unused macro

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michel Ludwig <michel.ludwig@gmail.com>
Cc: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] TM6000: Clean-up i2c initialization
Jean Delvare [Sun, 7 Nov 2010 15:53:44 +0000 (12:53 -0300)]
[media] TM6000: Clean-up i2c initialization

Usage of templates for large structures is a bad idea, as it wastes a
lot of space. Manually initializing the few fields we need is way more
efficient.

Also set the algorithm data const, use strlcpy instead of strcpy, fix
a small race (device data must always be set before registering said
device) and properly return error on adapter registration failure.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michel Ludwig <michel.ludwig@gmail.com>
Cc: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] rc: Remove ir-common module
Mauro Carvalho Chehab [Sat, 13 Nov 2010 19:49:10 +0000 (16:49 -0300)]
[media] rc: Remove ir-common module

Now, just one old bttv board uses the old RC5 raw decoding routines.
Its conversion to rc-core requires the generation of IRQ data for both
positive and negative transitions at the IRQ line. I'm not sure if
bttv driver supports it or if the transitions will be reliable enough.
So, due to the lack of hardware for testing, the better for now is to
just move the legacy routines to bttv driver, and wait for someone with
a Nebula Digi could help to port it to use also rc-core raw decoders.

Acked-by: Hermann Pitton <hermann-pitton@arcor.de>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] saa7134: Remove legacy IR decoding logic inside the module
Mauro Carvalho Chehab [Sat, 13 Nov 2010 19:19:54 +0000 (16:19 -0300)]
[media] saa7134: Remove legacy IR decoding logic inside the module

The only IR left still using the old raw decoders on saa7134 is ENCORE
FM 5.3. As it is now using the standard rc-core raw decoders, lots
of old code can be removed from saa7134.

Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] saa7134: use rc-core raw decoders for Encore FM 5.3
Mauro Carvalho Chehab [Sat, 13 Nov 2010 19:23:06 +0000 (16:23 -0300)]
[media] saa7134: use rc-core raw decoders for Encore FM 5.3

Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] tm6000: add revision check
Stefan Ringel [Tue, 9 Nov 2010 16:50:28 +0000 (13:50 -0300)]
[media] tm6000: add revision check

adding chip revision check

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] drivers/media: Use vzalloc
Joe Perches [Fri, 5 Nov 2010 03:07:39 +0000 (00:07 -0300)]
[media] drivers/media: Use vzalloc

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: New sensor ov7660 with bridge ov530 (ov519)
Jean-François Moine [Sat, 13 Nov 2010 08:10:27 +0000 (05:10 -0300)]
[media] gspca - ov519: New sensor ov7660 with bridge ov530 (ov519)

[mchehab@redhat.com: Some CodingStyle fixes]
Tested-by: Anca Emanuel <anca.emanuel@gmail.com>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Re-initialize the webcam at resume time
Jean-François Moine [Sat, 13 Nov 2010 06:56:41 +0000 (03:56 -0300)]
[media] gspca - ov519: Re-initialize the webcam at resume time

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Initialize the ov519 snapshot register
Jean-François Moine [Fri, 12 Nov 2010 19:13:17 +0000 (16:13 -0300)]
[media] gspca - ov519: Initialize the ov519 snapshot register

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Change the ov519 start and stop sequences
Jean-François Moine [Fri, 12 Nov 2010 18:32:29 +0000 (15:32 -0300)]
[media] gspca - ov519: Change the ov519 start and stop sequences

- start and stop streaming are done via the FRAR
- streaming suspend (for control change) is done by video reset

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Simplify the LED control functions
Jean-François Moine [Fri, 12 Nov 2010 18:07:35 +0000 (15:07 -0300)]
[media] gspca - ov519: Simplify the LED control functions

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Check the disabled controls at start time only
Jean-François Moine [Fri, 12 Nov 2010 16:59:48 +0000 (13:59 -0300)]
[media] gspca - ov519: Check the disabled controls at start time only

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Clearer debug and error messages
Jean-François Moine [Fri, 12 Nov 2010 16:53:10 +0000 (13:53 -0300)]
[media] gspca - ov519: Clearer debug and error messages

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Propagate errors to higher level
Jean-François Moine [Fri, 12 Nov 2010 10:54:02 +0000 (07:54 -0300)]
[media] gspca - ov519: Propagate errors to higher level

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Define the disabled controls in a table
Jean-François Moine [Fri, 12 Nov 2010 10:14:08 +0000 (07:14 -0300)]
[media] gspca - ov519: Define the disabled controls in a table

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Set their numbers in the ov519 and ov7670 register names
Jean-François Moine [Fri, 12 Nov 2010 09:12:09 +0000 (06:12 -0300)]
[media] gspca - ov519: Set their numbers in the ov519 and ov7670 register names

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Cleanup source
Jean-François Moine [Fri, 12 Nov 2010 08:31:34 +0000 (05:31 -0300)]
[media] gspca - ov519: Cleanup source

- move hexadecimal value to lowercase
- remove/add empty lines and spaces
- comment unused macros
- change some comments

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - cpia1: Fix error check
Nicolas Kaiser [Fri, 12 Nov 2010 07:32:35 +0000 (04:32 -0300)]
[media] gspca - cpia1: Fix error check

It looks to me like it was intended to check the return value
at this point.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Define the sensor types in an enum
Jean-François Moine [Thu, 11 Nov 2010 11:27:24 +0000 (08:27 -0300)]
[media] gspca - ov519: Define the sensor types in an enum

This patch also checks if the sensor is well detected at connection time.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Reduce the size of some variables
Jean-François Moine [Thu, 11 Nov 2010 11:05:50 +0000 (08:05 -0300)]
[media] gspca - ov519: Reduce the size of some variables

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Change types '__xx' to 'xx'
Jean-François Moine [Thu, 11 Nov 2010 11:04:06 +0000 (08:04 -0300)]
[media] gspca - ov519: Change types '__xx' to 'xx'

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Don't do USB exchanges after disconnection
Jean-François Moine [Thu, 11 Nov 2010 09:20:42 +0000 (06:20 -0300)]
[media] gspca - ov519: Don't do USB exchanges after disconnection

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - ov519: Handle the snapshot on capture stop when CONFIG_INPUT=m
Jean-François Moine [Thu, 11 Nov 2010 09:17:01 +0000 (06:17 -0300)]
[media] gspca - ov519: Handle the snapshot on capture stop when CONFIG_INPUT=m

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca-stv06xx: support bandwidth changing
Hans de Goede [Wed, 27 Oct 2010 12:12:30 +0000 (09:12 -0300)]
[media] gspca-stv06xx: support bandwidth changing

stv06xx devices have only one altsetting, but the actual used
bandwidth can be programmed through a register. We were already
setting this register lower then the max packetsize of the altsetting
indicates. This patch makes the gspca-stv06xx update the usb descriptor
for the alt setting to reflect the actual packetsize in use, so that
the usb subsystem uses the correct information for scheduling usb transfers.

This patch also tries to fallback to lower speeds in case a ENOSPC error
is received when submitting urbs, but currently this is only supported
with stv06xx cams with the pb0100 sensor, as this is the only one for
which we know how to change the framerate.

This patch is based on an initial incomplete patch by
Lee Jones <lee.jones@canonical.com>

Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] saa7164: Checkpatch compliance cleanup
Steven Toth [Fri, 12 Nov 2010 21:32:36 +0000 (18:32 -0300)]
[media] saa7164: Checkpatch compliance cleanup

Checkpatch compliance cleanup across files in the saa7164 driver.

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] saa7164: make buffer smaller
Dan Carpenter [Tue, 2 Nov 2010 03:22:23 +0000 (00:22 -0300)]
[media] saa7164: make buffer smaller

This isn't a runtime bug, it's just to make static checkers happy.

In vidioc_querycap() we copy a saa7164_dev ->name driver array into a
v4l2_capability -> driver array.  The ->driver array is only 16 chars
long so ->name also can't be more than 16 characters.

The ->name gets set in v4l2_capability() and it always is less than 16
characters so we can easily make the buffer smaller.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] tea6415c: return -EIO if i2c_check_functionality fails
Axel Lin [Mon, 1 Nov 2010 09:25:39 +0000 (06:25 -0300)]
[media] tea6415c: return -EIO if i2c_check_functionality fails

If the adapter does not support I2C_FUNC_SMBUS_WRITE_BYTE,
return -EIO instead of 0.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] drivers/media/video: Update WARN uses
Joe Perches [Sat, 30 Oct 2010 21:08:31 +0000 (18:08 -0300)]
[media] drivers/media/video: Update WARN uses

Add missing newlines.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] dvb-usb-gp8psk: get firmware and fpga versions
VDR User [Sat, 30 Oct 2010 18:49:49 +0000 (15:49 -0300)]
[media] dvb-usb-gp8psk: get firmware and fpga versions

This patch adds retrieval of firmware and FPGA versions of Genpix devices.
That information is useful for users who experience performance differences
with the various firmware versions, and may want to use a specific firmware
that best suits their needs.

Example dmesg output:
gp8psk: FW Version = 2.09.4 (0x20904)  Build 2009/04/02
gp8psk: FPGA Version = 1

Signed-off-by: Derek Kelly <user.vdr@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] cx231xx: Fix i2c support at cx231xx-input
Mauro Carvalho Chehab [Thu, 11 Nov 2010 11:14:16 +0000 (08:14 -0300)]
[media] cx231xx: Fix i2c support at cx231xx-input

There was a bug at cx231xx-input, where it were registering the remote
controls twice, one via ir-kbd-i2c and another directly.
Also, the patch that added rc_register_device() broke compilation for it.

This patch fixes cx231xx-input by fixing the depends on, to point to the
new symbol, and initializing the scanmask via platform_data.

While here, also fix Kconfig symbol change for IR core dependencies.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] ir-kbd-i2c: add rc_dev as a parameter to the driver
Mauro Carvalho Chehab [Fri, 12 Nov 2010 12:02:40 +0000 (09:02 -0300)]
[media] ir-kbd-i2c: add rc_dev as a parameter to the driver

There are several fields on rc_dev that drivers can benefit. Allow drivers
to pass it as a parameter to the driver.

For now, the rc_dev parameter is optional. If drivers don't pass it, create
them internally. However, the best is to create rc_dev inside the drivers,
in order to fill other fields, like open(), close(), driver_name, etc.
So, a latter patch making it mandatory and changing the caller drivers is
welcome.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] rc-core: convert winbond-cir
David Härdeman [Fri, 29 Oct 2010 19:08:28 +0000 (16:08 -0300)]
[media] rc-core: convert winbond-cir

Move winbond-cir from drivers/input/misc/ into drivers/media/rc/
and convert it to use rc-core.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] ir-core: make struct rc_dev the primary interface
David Härdeman [Fri, 29 Oct 2010 19:08:23 +0000 (16:08 -0300)]
[media] ir-core: make struct rc_dev the primary interface

This patch merges the ir_input_dev and ir_dev_props structs into a single
struct called rc_dev. The drivers and various functions in rc-core used
by the drivers are also changed to use rc_dev as the primary interface
when dealing with rc-core.

This means that the input_dev is abstracted away from the drivers which
is necessary if we ever want to support multiple input devs per rc device.

The new API is similar to what the input subsystem uses, i.e:
rc_device_alloc()
rc_device_free()
rc_device_register()
rc_device_unregister()

[mchehab@redhat.com: Fix compilation on mceusb and cx231xx, due to merge conflicts]
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main
David Härdeman [Wed, 10 Nov 2010 14:04:19 +0000 (11:04 -0300)]
[media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main

[mchehab@redhat.com: this patch were originally bundled with some renaming
stuff and with the file merges, as seen at:
https://patchwork.kernel.org/patch/291092/.

Instead of using the original approach, I wrote the rename patches and the
code merge as separate changes, then applied the difference on this patch.
This way, it is easier to see the real changes at the code, and will be easier
to merge upstream, especially if some conflict rises on the renaming patches]

Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] rc-core: merge rc-map.c into rc-main.c
Mauro Carvalho Chehab [Wed, 10 Nov 2010 02:44:27 +0000 (23:44 -0300)]
[media] rc-core: merge rc-map.c into rc-main.c

With this change, all rc-core functions are into just one file, except
for the rc-raw specific functions.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] rc-core: Merge rc-sysfs.c into rc-main.c
Mauro Carvalho Chehab [Wed, 10 Nov 2010 02:18:24 +0000 (23:18 -0300)]
[media] rc-core: Merge rc-sysfs.c into rc-main.c

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Rename rc-core files from ir- to rc-
Mauro Carvalho Chehab [Wed, 10 Nov 2010 02:09:57 +0000 (23:09 -0300)]
[media] Rename rc-core files from ir- to rc-

As protocol decoders are specific to InfraRed, keep their names as-is.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] rename drivers/media/IR to drives/media/rc
Mauro Carvalho Chehab [Wed, 10 Nov 2010 02:00:14 +0000 (23:00 -0300)]
[media] rename drivers/media/IR to drives/media/rc

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] ir-core: more cleanups of ir-functions.c
David Härdeman [Fri, 29 Oct 2010 19:08:12 +0000 (16:08 -0300)]
[media] ir-core: more cleanups of ir-functions.c

cx88 only depends on VIDEO_IR because it needs ir_extract_bits().
Move that function to ir-core.h and make it inline.

Lots of drivers had dependencies on VIDEO_IR when they really
wanted IR_CORE.

The only remaining drivers to depend on VIDEO_IR are bt8xx and
saa7134 (ir_rc5_timer_end is the only function exported by
ir-functions).

Rename VIDEO_IR -> IR_LEGACY to give a hint to anyone writing or
converting drivers to IR_CORE that they do not want a dependency
on IR_LEGACY.

Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] ir-core: remove remaining users of the ir-functions keyhandlers
David Härdeman [Fri, 29 Oct 2010 19:08:07 +0000 (16:08 -0300)]
[media] ir-core: remove remaining users of the ir-functions keyhandlers

This patch removes the remaining usages of the ir_input_nokey() and
ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c
by using the corresponding functionality in ir-core instead.

Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] ir-core: convert drivers/media/video/cx88 to ir-core
David Härdeman [Fri, 29 Oct 2010 19:08:02 +0000 (16:08 -0300)]
[media] ir-core: convert drivers/media/video/cx88 to ir-core

This patch converts the cx88 driver (for sampling hw) to use the
decoders provided by ir-core instead of the separate ones provided
by ir-functions (and gets rid of those).

The value for MO_DDS_IO had a comment saying it corresponded to
a 4kHz samplerate. That comment was unfortunately misleading. The
actual samplerate was something like 3250Hz.

The current value has been derived by analyzing the elapsed time
between interrupts for different values (knowing that each interrupt
corresponds to 32 samples).

Thanks to Mariusz Bialonczyk <manio@skyboo.net> for testing my patches
(about one a day for two weeks!) on actual hardware.

Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] radio-si4713: Add regulator framework support
Jarkko Nikula [Fri, 29 Oct 2010 14:31:39 +0000 (11:31 -0300)]
[media] radio-si4713: Add regulator framework support

Convert the driver to use regulator framework instead of set_power callback.
This with gpio_reset platform data provide cleaner way to manage chip VIO,
VDD and reset signal inside the driver.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Eduardo Valentin <eduardo.valentin@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au0828: enable VBI timeout when calling read() without streamon()
Devin Heitmueller [Sat, 9 Oct 2010 18:09:17 +0000 (15:09 -0300)]
[media] au0828: enable VBI timeout when calling read() without streamon()

Because some clients (e.g. tvtime) will just open the filehandle and call
read() instead of explicitly calling streamon first, we need to make sure the
VBI timeout routine gets enabled in this case.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au0828: fixes for timeout on no video
Devin Heitmueller [Sat, 9 Oct 2010 17:43:53 +0000 (14:43 -0300)]
[media] au0828: fixes for timeout on no video

The first pass of fixes to cause the driver to continue streaming even when
there is no video arriving over the ITU656 bus were not adequate.  Continue
the work from the previous patch.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au0828: continue video streaming even when no ITU-656 coming in
Devin Heitmueller [Thu, 2 Sep 2010 01:03:43 +0000 (22:03 -0300)]
[media] au0828: continue video streaming even when no ITU-656 coming in

We need the au0828 to continue delivering frames even when the device is not
delivering video, or else applications such as tvtime will block indefinitely.

Unfortunately, the au8522 doesn't have any sort of free-running mode or "blue
screen on no video" like some other decoders.

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au8522: Handle differences in comb filter config for s-video input
Devin Heitmueller [Sun, 27 Jun 2010 21:12:42 +0000 (18:12 -0300)]
[media] au8522: Handle differences in comb filter config for s-video input

Tweak the comb filter config when in s-video mode to match the Hauppauge
Windows driver values (based on register dumps).

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au8522: fix clamp control for different video modes
Devin Heitmueller [Sun, 27 Jun 2010 21:01:40 +0000 (18:01 -0300)]
[media] au8522: fix clamp control for different video modes

Straighten out the clamp control configurations for the various video modes,
based off of register diffs done against the Hauppauge Windows driver.

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au8522: cleanup code which disables audio decoder
Devin Heitmueller [Sun, 27 Jun 2010 20:40:42 +0000 (17:40 -0300)]
[media] au8522: cleanup code which disables audio decoder

Cleanup the routine which disables the audio decoder.  In particular, the i2s
output was being shut off but the audio processor itself was not, resulting
in more power being consumed than needed.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au0828: Fix field alignment for video frames delivered by driver
Devin Heitmueller [Mon, 5 Jul 2010 16:05:16 +0000 (13:05 -0300)]
[media] au0828: Fix field alignment for video frames delivered by driver

Fix the alignment of fields being delivered by the driver, which was
resulting in jerky video when there was horizontal motion (since the bottom
field of the frame was being sent with the top field of the previous frame)

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au0828: set max packets per URB to match Windows driver
Devin Heitmueller [Fri, 25 Jun 2010 04:33:39 +0000 (01:33 -0300)]
[media] au0828: set max packets per URB to match Windows driver

We had the max packets per URB set to an incredibly low "10" as opposed to
the Windows driver which has it as 128.  Set the value to match the
Windows driver, which will reduce interrupts considerably.

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] au8522: Properly set default brightness
Devin Heitmueller [Sun, 13 Jun 2010 20:31:22 +0000 (17:31 -0300)]
[media] au8522: Properly set default brightness

The chip's default value for the brightness didn't match what we were sending
back in the queryctrl ioctl(), so if the application actually set the
brightness to the "default", it would actually end up being way too bright.

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca: Convert some uppercase hexadecimal values to lowercase
Jean-François Moine [Fri, 29 Oct 2010 16:58:22 +0000 (13:58 -0300)]
[media] gspca: Convert some uppercase hexadecimal values to lowercase

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - sonixj: Simplify and clarify the hv7131r probe function
Jean-François Moine [Fri, 29 Oct 2010 11:10:37 +0000 (08:10 -0300)]
[media] gspca - sonixj: Simplify and clarify the hv7131r probe function

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - zc3xx: Bad clocksetting for mt9v111_3 with 640x480 resolution
Jean-François Moine [Fri, 29 Oct 2010 11:01:01 +0000 (08:01 -0300)]
[media] gspca - zc3xx: Bad clocksetting for mt9v111_3 with 640x480 resolution

The bad value prevented the autogain to work correctly
and some images were truncated.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - main: Fix a small code error
Jean-François Moine [Fri, 29 Oct 2010 10:57:03 +0000 (07:57 -0300)]
[media] gspca - main: Fix a small code error

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca - main: Version change
Jean-François Moine [Fri, 29 Oct 2010 10:56:06 +0000 (07:56 -0300)]
[media] gspca - main: Version change

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca_ov519: generate release button event on stream stop if needed
Hans de Goede [Wed, 27 Oct 2010 10:42:28 +0000 (07:42 -0300)]
[media] gspca_ov519: generate release button event on stream stop if needed

Generate a release button event when the button is still pressed when the
stream stops.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca_xirlink_cit: Add support camera button
Hans de Goede [Wed, 27 Oct 2010 09:38:07 +0000 (06:38 -0300)]
[media] gspca_xirlink_cit: Add support camera button

gspca_xirlink_cit: Add support camera button

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca_xirlink_cit: Frames have a 4 byte footer
Hans de Goede [Tue, 26 Oct 2010 20:21:33 +0000 (17:21 -0300)]
[media] gspca_xirlink_cit: Frames have a 4 byte footer

At least on the ibm netcam pro frames have a 4 byte footer, take this
into account when calculating sizeimage.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca_xirlink_cit: various usb bandwidth allocation improvements / fixes
Hans de Goede [Tue, 26 Oct 2010 14:18:59 +0000 (11:18 -0300)]
[media] gspca_xirlink_cit: various usb bandwidth allocation improvements / fixes

The following usb bandwidth allocation changes were made to the ibm netcam
pro code:
- Don't restart negotiation at max packet size on stop0, as that gets called
  by gspca_main during negotiation. Move this to sd_isoc_init.
- Don't ask for full bandwidth when running at 160x120, that does not need
  full bandwidth
- Make minimum acceptable bandwidth depend upon resolution

[mchehab@redhat.com: Fix CodingStyle problems at switch statements]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca: only set gspca->int_urb if submitting it succeeds
Hans de Goede [Tue, 26 Oct 2010 08:16:32 +0000 (05:16 -0300)]
[media] gspca: only set gspca->int_urb if submitting it succeeds

Currently alloc_and_submit_int_urb() is setting gspca->int_urb
as soon as the allocation has succeeded, but if the subsequent
submit fails, the urb gets destroyed. And then later will
get destroyed again in gspca_input_destroy_urb() because
gspca->int_urb is set, leading to a double free.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] gspca: submit interrupt urbs *after* isoc urbs
Hans de Goede [Tue, 26 Oct 2010 08:15:46 +0000 (05:15 -0300)]
[media] gspca: submit interrupt urbs *after* isoc urbs

Currently gspca supported usb-1.1 webcams for which we support the input
button through an interrupt endpoint won't stream (not enough bandwidth
error) when used through an USB-2.0 hub.

After much debugging I've found out that the cause for this is that the
ehci-sched.c schedeling code does not like it when there are already urb's
scheduled when (large) isoc urbs are queued. By moving the submission
of the interrupt urbs to after submitting the isoc urbs the camera
starts working again through usb-2.0 hubs.

Note that this does not fix isoc. streaming through a usb-hub while another
1.1 usb device (like the microphone of the same cam) is also active
at the same time :(

I've spend a long time analyzing the linux kernel ehci scheduler code,
resulting in this (long) mail:
http://www.spinics.net/lists/linux-usb/msg37982.html

The conclusion of the following mail thread is that yes there are several
issues when using usb-1.1 devices through a usb-2.0 hub, but these are not
easily fixable in the current code. Fixing this in ehci-sched.c requires
an almost full rewrite, which is not bound to happen anytime soon.

So with this patch gspca driven usb-1.1 webcams will atleast work when
connected through an usb-2.0 hub when the microphone is not used.

As an added bonus this patch avoids extra destroy/create input urb cycles
when we end up falling back to a lower speed alt setting because of bandwidth
limitations.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] lmedm04: change USB Timeouts to avoid troubles
Malcolm Priestley [Thu, 4 Nov 2010 20:17:51 +0000 (17:17 -0300)]
[media] lmedm04: change USB Timeouts to avoid troubles

DM04/QQBOX USB Timing change.

Improved timing to avoid USB corruptions on some systems.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Documentation/lmedm04: Fix firmware extract information
Malcolm Priestley [Tue, 2 Nov 2010 21:02:08 +0000 (18:02 -0300)]
[media] Documentation/lmedm04: Fix firmware extract information

Corrected Firmware Information for LG on LME2510.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] lmed04: Improve frontend handling
Malcolm Priestley [Wed, 27 Oct 2010 22:50:36 +0000 (19:50 -0300)]
[media] lmed04: Improve frontend handling

Improved frontend handling.

Frontend now remains open at all times, with signal lock, snr & signal level
polled from Interupt.

Updated driver for DM04/QQBOX USB DVB-S BOXES to version 1.70.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] cafe_ccic: fix colorspace corruption on resume
Daniel Drake [Wed, 27 Oct 2010 13:55:00 +0000 (10:55 -0300)]
[media] cafe_ccic: fix colorspace corruption on resume

If you suspend and resume during video capture, the video colours
are corrupted on resume. This is because the sensor is being unconditionally
powered off during the resume path.

Only power down during resume if the camera is not in use, and correctly
reconfigure the sensor during resume.
Fixes http://dev.laptop.org/ticket/10190

Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses
Joe Perches [Tue, 26 Oct 2010 02:44:25 +0000 (23:44 -0300)]
[media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses

Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) dprintk(...)

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] cx231xx: Add IR support for Pixelview Hybrid SBTVD
Mauro Carvalho Chehab [Sat, 23 Oct 2010 16:35:58 +0000 (13:35 -0300)]
[media] cx231xx: Add IR support for Pixelview Hybrid SBTVD

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] cx231xx: Add a driver for I2C-based IR
Mauro Carvalho Chehab [Sat, 23 Oct 2010 16:28:33 +0000 (13:28 -0300)]
[media] cx231xx: Add a driver for I2C-based IR

Although cx231xx has a very good IR support, already supported by
mceusb driver, some designs decided to add a separate I2C
microcontroller chip in order to handle IR.

Due to that, add a glue to ir-kbd-i2c is needed, in order to support
those devices.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG
Mauro Carvalho Chehab [Sun, 3 Oct 2010 10:01:26 +0000 (07:01 -0300)]
[media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Add support for Kworld SBTVD board
Mauro Carvalho Chehab [Sun, 3 Oct 2010 08:27:59 +0000 (05:27 -0300)]
[media] Add support for Kworld SBTVD board

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] mb86a20s: add support for serial streams
Mauro Carvalho Chehab [Sun, 3 Oct 2010 19:48:49 +0000 (16:48 -0300)]
[media] mb86a20s: add support for serial streams

By comparing the traffic between Pixelview (cx23102-based and Kworld
(saa7134-based), the only difference is at register 0xd5. After some
tests, It seems that it is used to change mode between serial and parallel.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] cx231xx: use callback to set agc on PixelView
Mauro Carvalho Chehab [Wed, 29 Sep 2010 14:07:08 +0000 (11:07 -0300)]
[media] cx231xx: use callback to set agc on PixelView

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] add digital support for PV SBTVD hybrid
Mauro Carvalho Chehab [Tue, 28 Sep 2010 02:44:27 +0000 (23:44 -0300)]
[media] add digital support for PV SBTVD hybrid

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Add analog support for Pixelvied Hybrid SBTVD
Mauro Carvalho Chehab [Sun, 26 Sep 2010 23:44:31 +0000 (20:44 -0300)]
[media] Add analog support for Pixelvied Hybrid SBTVD

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] add a driver for mb86a20s
Mauro Carvalho Chehab [Mon, 27 Sep 2010 23:52:43 +0000 (20:52 -0300)]
[media] add a driver for mb86a20s

This adds the trivial bits to mb86a20s. As the driver won't touch
at the channel/layer parameters, this may not be enough for
receiving all channels, especially ISDB-Tsb, but the driver worked
properly for receiving video channels on my tests.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] em28xx: Add support for Leadership ISDB-T
Mauro Carvalho Chehab [Fri, 10 Sep 2010 20:29:14 +0000 (17:29 -0300)]
[media] em28xx: Add support for Leadership ISDB-T

This device uses an em2874B + Sharp 921 One Seg frontend.

Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Re-write the s921 frontend
Mauro Carvalho Chehab [Fri, 10 Sep 2010 19:49:47 +0000 (16:49 -0300)]
[media] Re-write the s921 frontend

On our tests with Leadership ISDBT, the s921 frontend were not work. As its
design contained some weird things, it ended to be easier to just re-write
it, getting another frontend as an example (cx24123).

As the old s921 driver weren't used, there's no regression. Some info from
the old frontend were used as a way to double check the behavior that were
noticed on the USB dumps retrieved from Leadership driver.

Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years agoLinux 2.6.37-rc8 v2.6.37-rc8
Linus Torvalds [Wed, 29 Dec 2010 01:05:48 +0000 (17:05 -0800)]
Linux 2.6.37-rc8

13 years agoMerge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Tue, 28 Dec 2010 23:54:24 +0000 (15:54 -0800)]
Merge branch 'perf-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page

13 years agoMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Tue, 28 Dec 2010 23:53:54 +0000 (15:53 -0800)]
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()

13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
Linus Torvalds [Tue, 28 Dec 2010 19:23:50 +0000 (11:23 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c

13 years agoMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
Linus Torvalds [Tue, 28 Dec 2010 19:23:30 +0000 (11:23 -0800)]
Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] v4l: soc-camera: fix multiple simultaneous user case

13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Linus Torvalds [Tue, 28 Dec 2010 19:22:58 +0000 (11:22 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: Fix re-probing with PM_POST_RESTORE notification
  mmc: atmel-mci: fix multiblock SDIO transfers
  mmc: at91_mci: fix multiblock SDIO transfers

13 years agoARM: fix IXP4xx build failure
Imre Kaloz [Mon, 27 Dec 2010 21:59:57 +0000 (22:59 +0100)]
ARM: fix IXP4xx build failure

arm: export dma_set_coherent_mask

While a regression was fixed with commit 710224fa2750cf (arm: fix
"arm: fix pci_set_consistent_dma_mask for dmabounce devices"), a
new one was introduced as dma_set_coherent_mask wasn't exported
for modules. This patch takes care for this issue.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoRAMOOPS: Don't overflow over non-allocated regions
Ahmed S. Darwish [Sat, 25 Dec 2010 09:57:09 +0000 (11:57 +0200)]
RAMOOPS: Don't overflow over non-allocated regions

The current code mis-calculates the ramoops header size, leading to an
overflow over the next record at best, or over a non-allocated region at
worst.  Fix that calculation.

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Acked-by: Marco Stornelli <marco.stornelli@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branch 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 27 Dec 2010 18:36:27 +0000 (10:36 -0800)]
Merge branch 'nommu-fixes-for-linus' of git://git./linux/kernel/git/lethal/nommu-2.6

* 'nommu-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6:
  nommu: Provide stubbed alloc/free_vm_area() implementation.
  nommu: Fix up vmalloc_node() symbol export regression.

13 years agoMerge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 27 Dec 2010 18:34:09 +0000 (10:34 -0800)]
Merge branch 'sh-fixes-for-linus' of git://git./linux/kernel/git/lethal/sh-2.6

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: intc: Initialize radix tree gfp mask explicitly.
  sh: Fix up SH7201 clkfwk build.
  sh: mach-se: Fix up SE7206 build.
  sh: Fix up SH4-202 clkfwk build.

13 years agoMerge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 27 Dec 2010 18:33:30 +0000 (10:33 -0800)]
Merge branch 'fbdev-fixes-for-linus' of git://git./linux/kernel/git/lethal/fbdev-2.6

* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
  video: imxfb: Fix the maximum value for yres
  fb: fix overlapping test off-by-one.
  fbdev: sh-mobile: retrieve and propagate display sizes from EDID
  fbdev: sh-mobile: restore display size configuration

13 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
Linus Torvalds [Mon, 27 Dec 2010 18:25:02 +0000 (10:25 -0800)]
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_cs5536: avoid implicit MSR API inclusion on x86-64

13 years agofbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
Guennadi Liakhovetski [Thu, 4 Nov 2010 11:06:06 +0000 (11:06 +0000)]
fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p

LCDC hardware can support 1920x1080 formats, adjust the driver to cover them.
Besides, instead of guessing some "reasonable" validity checks, only verify
values in .fb_check_var(), that we are sure, we cannot support.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>