X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fcx23885%2Fcx23885-video.c;h=5aadc1d1956e73213cb95dae7aefd16e0aa4a887;hb=473d80247332b818caf6d25ed3eaaa10d3dfcfb7;hp=da66e5f8d91d1c40d60042d14bdd3c8f4cb21b36;hpb=6c2d4dd139de417d18151b98c157aa35387038a3;p=android-x86%2Fkernel.git diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index da66e5f8d91d..5aadc1d1956e 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c @@ -1165,9 +1165,10 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i) i->type = V4L2_INPUT_TYPE_CAMERA; strcpy(i->name, iname[INPUT(n)->type]); if ((CX23885_VMUX_TELEVISION == INPUT(n)->type) || - (CX23885_VMUX_CABLE == INPUT(n)->type)) + (CX23885_VMUX_CABLE == INPUT(n)->type)) { i->type = V4L2_INPUT_TYPE_TUNER; i->std = CX23885_NORMS; + } return 0; }