From: Hans Verkuil Date: Fri, 6 Aug 2010 19:18:23 +0000 (-0300) Subject: V4L/DVB: cx25821: convert to the mediabus API X-Git-Tag: MMI-PSA29.97-13-9~21911^2~497 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c5e76a6d2aecca761f57b7a40df79812fad7fb98;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git V4L/DVB: cx25821: convert to the mediabus API Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c index 1d5e8796d383..6fff985358a6 100644 --- a/drivers/staging/cx25821/cx25821-video.c +++ b/drivers/staging/cx25821/cx25821-video.c @@ -993,6 +993,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, { struct cx25821_fh *fh = priv; struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; + struct v4l2_mbus_framefmt mbus_fmt; int err; int pix_format = PIXEL_FRMT_422; @@ -1039,7 +1040,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width, fh->height, fh->vidq.field); - cx25821_call_all(dev, video, s_fmt, f); + v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED); + cx25821_call_all(dev, video, s_mbus_fmt, &mbus_fmt); return 0; }