diff options
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-video.c')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-video.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index e0a59523cf3c..91e4cb457296 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c | |||
| @@ -507,6 +507,7 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input) | |||
| 507 | if ((dev->board == CX23885_BOARD_HAUPPAUGE_HVR1800) || | 507 | if ((dev->board == CX23885_BOARD_HAUPPAUGE_HVR1800) || |
| 508 | (dev->board == CX23885_BOARD_MPX885) || | 508 | (dev->board == CX23885_BOARD_MPX885) || |
| 509 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) || | 509 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) || |
| 510 | (dev->board == CX23885_BOARD_HAUPPAUGE_IMPACTVCBE) || | ||
| 510 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) || | 511 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) || |
| 511 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) || | 512 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) || |
| 512 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850) || | 513 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850) || |
| @@ -1156,7 +1157,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
| 1156 | V4L2_CAP_READWRITE | | 1157 | V4L2_CAP_READWRITE | |
| 1157 | V4L2_CAP_STREAMING | | 1158 | V4L2_CAP_STREAMING | |
| 1158 | V4L2_CAP_VBI_CAPTURE; | 1159 | V4L2_CAP_VBI_CAPTURE; |
| 1159 | if (UNSET != dev->tuner_type) | 1160 | if (dev->tuner_type != TUNER_ABSENT) |
| 1160 | cap->capabilities |= V4L2_CAP_TUNER; | 1161 | cap->capabilities |= V4L2_CAP_TUNER; |
| 1161 | return 0; | 1162 | return 0; |
| 1162 | } | 1163 | } |
| @@ -1474,7 +1475,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
| 1474 | { | 1475 | { |
| 1475 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1476 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
| 1476 | 1477 | ||
| 1477 | if (unlikely(UNSET == dev->tuner_type)) | 1478 | if (dev->tuner_type == TUNER_ABSENT) |
| 1478 | return -EINVAL; | 1479 | return -EINVAL; |
| 1479 | if (0 != t->index) | 1480 | if (0 != t->index) |
| 1480 | return -EINVAL; | 1481 | return -EINVAL; |
| @@ -1490,7 +1491,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, | |||
| 1490 | { | 1491 | { |
| 1491 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1492 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
| 1492 | 1493 | ||
| 1493 | if (UNSET == dev->tuner_type) | 1494 | if (dev->tuner_type == TUNER_ABSENT) |
| 1494 | return -EINVAL; | 1495 | return -EINVAL; |
| 1495 | if (0 != t->index) | 1496 | if (0 != t->index) |
| 1496 | return -EINVAL; | 1497 | return -EINVAL; |
| @@ -1506,7 +1507,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, | |||
| 1506 | struct cx23885_fh *fh = priv; | 1507 | struct cx23885_fh *fh = priv; |
| 1507 | struct cx23885_dev *dev = fh->dev; | 1508 | struct cx23885_dev *dev = fh->dev; |
| 1508 | 1509 | ||
| 1509 | if (unlikely(UNSET == dev->tuner_type)) | 1510 | if (dev->tuner_type == TUNER_ABSENT) |
| 1510 | return -EINVAL; | 1511 | return -EINVAL; |
| 1511 | 1512 | ||
| 1512 | /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */ | 1513 | /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */ |
| @@ -1522,7 +1523,7 @@ static int cx23885_set_freq(struct cx23885_dev *dev, const struct v4l2_frequency | |||
| 1522 | { | 1523 | { |
| 1523 | struct v4l2_control ctrl; | 1524 | struct v4l2_control ctrl; |
| 1524 | 1525 | ||
| 1525 | if (unlikely(UNSET == dev->tuner_type)) | 1526 | if (dev->tuner_type == TUNER_ABSENT) |
| 1526 | return -EINVAL; | 1527 | return -EINVAL; |
| 1527 | if (unlikely(f->tuner != 0)) | 1528 | if (unlikely(f->tuner != 0)) |
| 1528 | return -EINVAL; | 1529 | return -EINVAL; |
