提交 0f3bf3dc 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

[media] cx23885: fix UNSET/TUNER_ABSENT confusion

Sometimes dev->tuner_type is compared to UNSET, sometimes to TUNER_ABSENT,
but these defines have different values.

Standardize to TUNER_ABSENT.
Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
上级 ee27aa90
...@@ -1266,7 +1266,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, ...@@ -1266,7 +1266,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
struct cx23885_fh *fh = file->private_data; struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev; struct cx23885_dev *dev = fh->dev;
if (UNSET == dev->tuner_type) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
if (0 != t->index) if (0 != t->index)
return -EINVAL; return -EINVAL;
...@@ -1284,7 +1284,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, ...@@ -1284,7 +1284,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
struct cx23885_fh *fh = file->private_data; struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev; struct cx23885_dev *dev = fh->dev;
if (UNSET == dev->tuner_type) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
/* Update the A/V core */ /* Update the A/V core */
...@@ -1299,7 +1299,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, ...@@ -1299,7 +1299,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
struct cx23885_fh *fh = file->private_data; struct cx23885_fh *fh = file->private_data;
struct cx23885_dev *dev = fh->dev; struct cx23885_dev *dev = fh->dev;
if (UNSET == dev->tuner_type) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
f->type = V4L2_TUNER_ANALOG_TV; f->type = V4L2_TUNER_ANALOG_TV;
f->frequency = dev->freq; f->frequency = dev->freq;
...@@ -1347,7 +1347,7 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -1347,7 +1347,7 @@ static int vidioc_querycap(struct file *file, void *priv,
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
0; 0;
if (UNSET != dev->tuner_type) if (dev->tuner_type != TUNER_ABSENT)
cap->capabilities |= V4L2_CAP_TUNER; cap->capabilities |= V4L2_CAP_TUNER;
return 0; return 0;
......
...@@ -1157,7 +1157,7 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -1157,7 +1157,7 @@ static int vidioc_querycap(struct file *file, void *priv,
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
V4L2_CAP_STREAMING | V4L2_CAP_STREAMING |
V4L2_CAP_VBI_CAPTURE; V4L2_CAP_VBI_CAPTURE;
if (UNSET != dev->tuner_type) if (dev->tuner_type != TUNER_ABSENT)
cap->capabilities |= V4L2_CAP_TUNER; cap->capabilities |= V4L2_CAP_TUNER;
return 0; return 0;
} }
...@@ -1475,7 +1475,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, ...@@ -1475,7 +1475,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
{ {
struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
if (unlikely(UNSET == dev->tuner_type)) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
if (0 != t->index) if (0 != t->index)
return -EINVAL; return -EINVAL;
...@@ -1491,7 +1491,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, ...@@ -1491,7 +1491,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
{ {
struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
if (UNSET == dev->tuner_type) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
if (0 != t->index) if (0 != t->index)
return -EINVAL; return -EINVAL;
...@@ -1507,7 +1507,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, ...@@ -1507,7 +1507,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
struct cx23885_fh *fh = priv; struct cx23885_fh *fh = priv;
struct cx23885_dev *dev = fh->dev; struct cx23885_dev *dev = fh->dev;
if (unlikely(UNSET == dev->tuner_type)) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
/* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */ /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */
...@@ -1523,7 +1523,7 @@ static int cx23885_set_freq(struct cx23885_dev *dev, const struct v4l2_frequency ...@@ -1523,7 +1523,7 @@ static int cx23885_set_freq(struct cx23885_dev *dev, const struct v4l2_frequency
{ {
struct v4l2_control ctrl; struct v4l2_control ctrl;
if (unlikely(UNSET == dev->tuner_type)) if (dev->tuner_type == TUNER_ABSENT)
return -EINVAL; return -EINVAL;
if (unlikely(f->tuner != 0)) if (unlikely(f->tuner != 0))
return -EINVAL; return -EINVAL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册