From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 9 Jun 2013 01:15:25 +0000 (-0300)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20130617~82^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d3fa77a20489b149ea36418164ab0d975a808817;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (73 commits)
  [media] drxk_hard: Remove most 80-cols checkpatch warnings
  [media] drxk_hard: remove needless parenthesis
  [media] drxk_hard.h: don't use more than 80 columns
  [media] drxk_hard.h: Remove some alien comment markups
  [media] drxk_hard: use usleep_range()
  [media] drxk_hard: don't split strings across lines
  [media] drxk_hard: use pr_info/pr_warn/pr_err/... macros
  [media] drxk_hard: Don't use CamelCase
  [media] drxk_hard: don't re-implement log10
  [media] rtl28xxu: correct latest device name
  [media] Add support for Crypto Redi PC50A device (rtl2832u + FC0012 tuner)
  [media] rtl28xxu: use masked reg write where possible
  [media] rtl28xxu: map remote for TerraTec Cinergy T Stick Black
  [media] rtl28xxu: correct some device names
  [media] rtl28xxu: Add USB ID for Leadtek WinFast DTV Dongle mini
  [media] rtl28xxu: remove redundant IS_ENABLED macro
  [media] rtl28xxu: reimplement rtl2832u remote controller
  [media] rtl2832u: restore ir remote control support
  [media] media: Rename media_entity_remote_source to media_entity_remote_pad
  [media] af9035: correct TS mode handling
  ...
---

d3fa77a20489b149ea36418164ab0d975a808817
diff --cc drivers/media/platform/coda.c
index 9d1481a60bd9,c4566c447774..df4ada880e42
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@@ -617,8 -650,8 +658,9 @@@ static const struct v4l2_ioctl_ops coda
  	.vidioc_querybuf	= vidioc_querybuf,
  
  	.vidioc_qbuf		= vidioc_qbuf,
+ 	.vidioc_expbuf		= vidioc_expbuf,
  	.vidioc_dqbuf		= vidioc_dqbuf,
 +	.vidioc_create_bufs	= vidioc_create_bufs,
  
  	.vidioc_streamon	= vidioc_streamon,
  	.vidioc_streamoff	= vidioc_streamoff,