linux.git/drivers/media, branch v3.0-rc4

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-06-09T20:09:07+00:00

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: iio: max517: Fix iio_info changes
  Staging: mei: fix debug code
  Staging: cx23885: fix include of altera.h
  staging: iio: error case memory leak fix
  staging: ath6kl: Fix a kernel panic during suspend/resume
  staging: gma500: get control from firmware framebuffer if conflicts
  staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight
  staging: usbip: bugfix prevent driver unbind
  staging: iio: industrialio-trigger: set iio_poll_func private_data
  staging: rts_pstor: use bitwise operator instead of logical one
  staging: fix ath6kl build when CFG80211 is not enabled
  staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err
  staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE
  Staging: remove STAGING_EXCLUDE_BUILD option
  Staging: altera: move .h file to proper place

Staging: cx23885: fix include of altera.h

2011-06-08T16:18:32+00:00

The cx23885 driver was including staging/altera.h, but that file has
moved back into the driver directory.

Why a non-staging driver was including a staging driver is beyond me,
but this fixes the build so everything is happy for now.

For the record, it's not ok for a non-staging driver to depend on a
staging one, as that implies that the non-staging one should also be in
the staging tree if that's needed.

Cc: Igor M. Liplianin 
Cc: Mauro Carvalho Chehab 
Signed-off-by: Greg Kroah-Hartman

[media] soc_camera: preserve const attribute

2011-06-01T18:03:56+00:00

drivers/media/video/soc_camera.c: In function ‘soc_camera_video_start’:
drivers/media/video/soc_camera.c:1515: warning: initialization discards qualifiers from pointer target type

Signed-off-by: Mauro Carvalho Chehab

[media] uvc_entity: initialize return value

2011-06-01T17:45:52+00:00

drivers/media/video/uvc/uvc_entity.c: In function ‘uvc_mc_register_entities’:
drivers/media/video/uvc/uvc_entity.c:33: warning: ‘ret’ may be used uninitialized in this function

Signed-off-by: Mauro Carvalho Chehab

[media] media: Fix media device minor registration

2011-06-01T16:24:23+00:00

The find_next_zero_bit() is called with the from and to arguments in the
wrong order. This results in the function always returning 0, and all
media devices being registered with minor 0. Furthermore, mdev->minor is
then used before being assigned with the find_next_zero_bit() return
value. This really makes sure we'll always use minor 0.

Fix this and let the system support more than one media device.

Signed-off-by: Laurent Pinchart 
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab

[media] Make nchg variable signed because the code compares this variable against negative values

2011-06-01T15:20:57+00:00

The sonixj driver compares the value for nchg with:
 		if (sd->nchg < -6 || sd->nchg >= 12) {

With u8, negative values won't work.

Signed-off-by: Hans Petter Selasky 
Acked-by: Jean-Francois Moine 
Signed-off-by: Mauro Carvalho Chehab

[media] omap3isp: fix compiler warning

2011-06-01T12:42:28+00:00

This patch fixes this compiler warning:
  drivers/media/video/omap3isp/isp.c: In function 'isp_isr_dbg':
  drivers/media/video/omap3isp/isp.c:392:2: warning: zero-length
   gnu_printf format string

Signed-off-by: Sanjeev Premi 
Acked-by: Laurent Pinchart 
Signed-off-by: Mauro Carvalho Chehab

[media] ivtv: Internally separate encoder & decoder standard setting

2011-06-01T11:46:38+00:00

Internally separates the setting of the broadcast standard for the encoder &
decoder. Externally there's no change in functionality.

[awalls@md.metrocast.net: Edited to fix a checkpatch gripe about multiple
assignment and to remove a now unused DEFINE_WAIT() due to this patch]

Signed-off-by: Ian Armstrong 
Signed-off-by: Andy Walls 
Signed-off-by: Mauro Carvalho Chehab

[media] ivtvfb: Add sanity check to ivtvfb_pan_display()

2011-06-01T11:45:36+00:00

Add sanity check to ivtvfb_pan_display() to ensure only valid values are used
to pan the display. Invalid values are rejected with -EINVAL

Signed-off-by: Ian Armstrong 
Signed-off-by: Andy Walls 
Signed-off-by: Mauro Carvalho Chehab

[media] ivtvfb: use display information in info not in var for panning

2011-06-01T11:45:19+00:00

We must not use any information in the passed var besides xoffset,
yoffset and vmode as otherwise applications might abuse it. Also use the
aligned fix.line_length and not the (possible) unaligned xres_virtual.

Signed-off-by: Laurent Pinchart 
Reviewed-by: Ian Armstrong 
Signed-off-by: Andy Walls 
Signed-off-by: Mauro Carvalho Chehab