From ef7805359ef02d3645260650e3730ed98d5b4738 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 10 Oct 2011 11:09:56 -0300 Subject: [PATCH] --- yaml --- r: 271975 b: refs/heads/master c: 84f42af66535a57875b72678126c4238142ad4be h: refs/heads/master i: 271973: 7cad8c117a08fb052d6124b2ea8b1cbc5c1124ad 271971: e11a504fd34d741ac262e07ea1a1552ace2e4f59 271967: 980172ac1ac27ee12344886630fa434bf6846596 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-video.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 75424e47e91e..ff4fcc64e68c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c6f52fd6024b40297db32acb67f1fce6c6d1ae3 +refs/heads/master: 84f42af66535a57875b72678126c4238142ad4be diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c index 7291f64e92bc..65b1bd2fc4e8 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-video.c +++ b/trunk/drivers/media/video/cx23885/cx23885-video.c @@ -543,13 +543,6 @@ static int cx23885_audio_mux(struct cx23885_dev *dev, unsigned int input) } /* ------------------------------------------------------------------ */ -static int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width, - unsigned int height, enum v4l2_field field) -{ - dprintk(1, "%s()\n", __func__); - return 0; -} - static int cx23885_start_video_dma(struct cx23885_dev *dev, struct cx23885_dmaqueue *q, struct cx23885_buffer *buf) @@ -559,7 +552,6 @@ static int cx23885_start_video_dma(struct cx23885_dev *dev, /* setup fifo + format */ cx23885_sram_channel_setup(dev, &dev->sram_channels[SRAM_CH01], buf->bpl, buf->risc.dma); - cx23885_set_scale(dev, buf->vb.width, buf->vb.height, buf->vb.field); /* reset counter */ cx_write(VID_A_GPCNT_CTL, 3);