Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f3bf3dc authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ee27aa90

drivers/media/pci/cx23885/cx23885-417.c

+4 −4
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
	struct cx23885_fh  *fh  = file->private_data;

	struct cx23885_dev *dev = fh->dev;



	if (UNSET == dev->tuner_type)

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;

	if (0 != t->index)

		return -EINVAL;
@@ -1284,7 +1284,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, 
	struct cx23885_fh  *fh  = file->private_data;

	struct cx23885_dev *dev = fh->dev;



	if (UNSET == dev->tuner_type)

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;



	/* Update the A/V core */
@@ -1299,7 +1299,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, 
	struct cx23885_fh  *fh  = file->private_data;

	struct cx23885_dev *dev = fh->dev;



	if (UNSET == dev->tuner_type)

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;

	f->type = V4L2_TUNER_ANALOG_TV;

	f->frequency = dev->freq;
@@ -1347,7 +1347,7 @@ static int vidioc_querycap(struct file *file, void *priv, 
		V4L2_CAP_READWRITE     |

		V4L2_CAP_STREAMING     |

		0;

	if (UNSET != dev->tuner_type)

	if (dev->tuner_type != TUNER_ABSENT)

		cap->capabilities |= V4L2_CAP_TUNER;



	return 0;

drivers/media/pci/cx23885/cx23885-video.c

+5 −5
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ static int vidioc_querycap(struct file *file, void *priv, 
		V4L2_CAP_READWRITE     |

		V4L2_CAP_STREAMING     |

		V4L2_CAP_VBI_CAPTURE;

	if (UNSET != dev->tuner_type)

	if (dev->tuner_type != TUNER_ABSENT)

		cap->capabilities |= V4L2_CAP_TUNER;

	return 0;

}
@@ -1475,7 +1475,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
{

	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;



	if (unlikely(UNSET == dev->tuner_type))

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;

	if (0 != t->index)

		return -EINVAL;
@@ -1491,7 +1491,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, 
{

	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;



	if (UNSET == dev->tuner_type)

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;

	if (0 != t->index)

		return -EINVAL;
@@ -1507,7 +1507,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, 
	struct cx23885_fh *fh = priv;

	struct cx23885_dev *dev = fh->dev;



	if (unlikely(UNSET == dev->tuner_type))

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;



	/* 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 
{

	struct v4l2_control ctrl;



	if (unlikely(UNSET == dev->tuner_type))

	if (dev->tuner_type == TUNER_ABSENT)

		return -EINVAL;

	if (unlikely(f->tuner != 0))

		return -EINVAL;