From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 26 Sep 2012 23:23:56 +0000 (-0300)
Subject: Merge /home/v4l/v4l/patchwork
X-Git-Tag: next-20121005~58^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56ed2f3ce5118d2734dd65f2994b5aa1e9e59c19;p=karo-tx-linux.git

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (67 commits)
  [media] tvaudio: add back lost tda9875 copyright
  [media] radio drivers: in non-blocking mode return EAGAIN in hwseek
  [media] DocBook: in non-blocking mode return EAGAIN in hwseek
  [media] DocBook: EAGAIN == EWOULDBLOCK
  [media] Docbook: add missing vidioc-subdev-g-edid.xml
  [media] smiapp: Provide module identification information through sysfs
  [media] smiapp: Use highest bits-per-pixel for sensor internal format
  [media] smiapp: Remove unused function
  [media] smiapp: Use devm_* functions in smiapp-core.c file
  [media] Add v4l2 subdev driver for S5K4ECGX sensor
  [media] m2m-deinterlace: Add V4L2_CAP_VIDEO_M2M capability flag
  [media] davinci: vpif: capture/display: fix race condition
  [media] davinci: vpif: remove unwanted header file inclusion
  [media] vpif: replace preset with the timings API
  [media] media: coda: set up buffers to be sized as negotiated with s_fmt
  [media] media: coda: add byte size slice limit control
  [media] media: coda: add horizontal / vertical flipping support
  [media] media: coda: fix sizeimage setting in try_fmt
  [media] media: coda: wait for picture run completion in start/stop_streaming
  [media] media: coda: enable user pointer support
  ...
---

56ed2f3ce5118d2734dd65f2994b5aa1e9e59c19
diff --cc drivers/media/platform/s5p-fimc/fimc-m2m.c
index 1d840640917f,9237e53cf6df..51fc04c2f27c
--- a/drivers/media/platform/s5p-fimc/fimc-m2m.c
+++ b/drivers/media/platform/s5p-fimc/fimc-m2m.c
@@@ -792,8 -802,9 +792,9 @@@ int fimc_register_m2m_device(struct fim
  	vfd->ioctl_ops = &fimc_m2m_ioctl_ops;
  	vfd->v4l2_dev = v4l2_dev;
  	vfd->minor = -1;
 -	vfd->release = video_device_release;
 +	vfd->release = video_device_release_empty;
  	vfd->lock = &fimc->lock;
+ 	vfd->vfl_dir = VFL_DIR_M2M;
  
  	snprintf(vfd->name, sizeof(vfd->name), "fimc.%d.m2m", fimc->id);
  	video_set_drvdata(vfd, fimc);