소스 검색

V4L/DVB (5107): Use cx88_set_freq() on cx88-blackbird.c

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab 18 년 전
부모
커밋
84f1b6783a
1개의 변경된 파일1개의 추가작업 그리고 18개의 파일을 삭제
  1. 1 18
      drivers/media/video/cx88/cx88-blackbird.c

+ 1 - 18
drivers/media/video/cx88/cx88-blackbird.c

@@ -963,24 +963,7 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
 				  BLACKBIRD_MPEG_CAPTURE,
 				  BLACKBIRD_MPEG_CAPTURE,
 				  BLACKBIRD_RAW_BITS_NONE);
 				  BLACKBIRD_RAW_BITS_NONE);
 
 
-		if (UNSET == core->tuner_type)
-			return -EINVAL;
-		if (f->tuner != 0)
-			return -EINVAL;
-		if (0 == radio && f->type != V4L2_TUNER_ANALOG_TV)
-			return -EINVAL;
-		if (1 == radio && f->type != V4L2_TUNER_RADIO)
-			return -EINVAL;
-		mutex_lock(&core->lock);
-		core->freq = f->frequency;
-		cx88_newstation(core);
-		cx88_call_i2c_clients(core,VIDIOC_S_FREQUENCY,f);
-
-		/* When changing channels it is required to reset TVAUDIO */
-		msleep (10);
-		cx88_set_tvaudio(core);
-
-		mutex_unlock(&core->lock);
+		cx88_set_freq (core,f);
 
 
 		blackbird_initialize_codec(dev);
 		blackbird_initialize_codec(dev);
 		cx88_set_scale(dev->core, dev->width, dev->height,
 		cx88_set_scale(dev->core, dev->width, dev->height,