diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-06-27 10:15:41 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-01 14:30:59 -0400 |
| commit | 0f3bf3dc1ca394a8385079a5653088672b65c5c4 (patch) | |
| tree | 58d55176832f5f5595d2bca9bc4b84caebcdfc4b /drivers | |
| parent | ee27aa901805dfc9c3a5eb5f0948eba9ab481ba1 (diff) | |
[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-417.c | 8 | ||||
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-video.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 95666eee7b27..bf89fc88692e 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c | |||
| @@ -1266,7 +1266,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
| 1266 | struct cx23885_fh *fh = file->private_data; | 1266 | struct cx23885_fh *fh = file->private_data; |
| 1267 | struct cx23885_dev *dev = fh->dev; | 1267 | struct cx23885_dev *dev = fh->dev; |
| 1268 | 1268 | ||
| 1269 | if (UNSET == dev->tuner_type) | 1269 | if (dev->tuner_type == TUNER_ABSENT) |
| 1270 | return -EINVAL; | 1270 | return -EINVAL; |
| 1271 | if (0 != t->index) | 1271 | if (0 != t->index) |
| 1272 | return -EINVAL; | 1272 | return -EINVAL; |
| @@ -1284,7 +1284,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, | |||
| 1284 | struct cx23885_fh *fh = file->private_data; | 1284 | struct cx23885_fh *fh = file->private_data; |
| 1285 | struct cx23885_dev *dev = fh->dev; | 1285 | struct cx23885_dev *dev = fh->dev; |
| 1286 | 1286 | ||
| 1287 | if (UNSET == dev->tuner_type) | 1287 | if (dev->tuner_type == TUNER_ABSENT) |
| 1288 | return -EINVAL; | 1288 | return -EINVAL; |
| 1289 | 1289 | ||
| 1290 | /* Update the A/V core */ | 1290 | /* Update the A/V core */ |
| @@ -1299,7 +1299,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, | |||
| 1299 | struct cx23885_fh *fh = file->private_data; | 1299 | struct cx23885_fh *fh = file->private_data; |
| 1300 | struct cx23885_dev *dev = fh->dev; | 1300 | struct cx23885_dev *dev = fh->dev; |
| 1301 | 1301 | ||
| 1302 | if (UNSET == dev->tuner_type) | 1302 | if (dev->tuner_type == TUNER_ABSENT) |
| 1303 | return -EINVAL; | 1303 | return -EINVAL; |
| 1304 | f->type = V4L2_TUNER_ANALOG_TV; | 1304 | f->type = V4L2_TUNER_ANALOG_TV; |
| 1305 | f->frequency = dev->freq; | 1305 | f->frequency = dev->freq; |
| @@ -1347,7 +1347,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
| 1347 | V4L2_CAP_READWRITE | | 1347 | V4L2_CAP_READWRITE | |
| 1348 | V4L2_CAP_STREAMING | | 1348 | V4L2_CAP_STREAMING | |
| 1349 | 0; | 1349 | 0; |
| 1350 | if (UNSET != dev->tuner_type) | 1350 | if (dev->tuner_type != TUNER_ABSENT) |
| 1351 | cap->capabilities |= V4L2_CAP_TUNER; | 1351 | cap->capabilities |= V4L2_CAP_TUNER; |
| 1352 | 1352 | ||
| 1353 | return 0; | 1353 | return 0; |
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index 71e3ec3d8a3d..91e4cb457296 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c | |||
| @@ -1157,7 +1157,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
| 1157 | V4L2_CAP_READWRITE | | 1157 | V4L2_CAP_READWRITE | |
| 1158 | V4L2_CAP_STREAMING | | 1158 | V4L2_CAP_STREAMING | |
| 1159 | V4L2_CAP_VBI_CAPTURE; | 1159 | V4L2_CAP_VBI_CAPTURE; |
| 1160 | if (UNSET != dev->tuner_type) | 1160 | if (dev->tuner_type != TUNER_ABSENT) |
| 1161 | cap->capabilities |= V4L2_CAP_TUNER; | 1161 | cap->capabilities |= V4L2_CAP_TUNER; |
| 1162 | return 0; | 1162 | return 0; |
| 1163 | } | 1163 | } |
| @@ -1475,7 +1475,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
| 1475 | { | 1475 | { |
| 1476 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1476 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
| 1477 | 1477 | ||
| 1478 | if (unlikely(UNSET == dev->tuner_type)) | 1478 | if (dev->tuner_type == TUNER_ABSENT) |
| 1479 | return -EINVAL; | 1479 | return -EINVAL; |
| 1480 | if (0 != t->index) | 1480 | if (0 != t->index) |
| 1481 | return -EINVAL; | 1481 | return -EINVAL; |
| @@ -1491,7 +1491,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, | |||
| 1491 | { | 1491 | { |
| 1492 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1492 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
| 1493 | 1493 | ||
| 1494 | if (UNSET == dev->tuner_type) | 1494 | if (dev->tuner_type == TUNER_ABSENT) |
| 1495 | return -EINVAL; | 1495 | return -EINVAL; |
| 1496 | if (0 != t->index) | 1496 | if (0 != t->index) |
| 1497 | return -EINVAL; | 1497 | return -EINVAL; |
| @@ -1507,7 +1507,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, | |||
| 1507 | struct cx23885_fh *fh = priv; | 1507 | struct cx23885_fh *fh = priv; |
| 1508 | struct cx23885_dev *dev = fh->dev; | 1508 | struct cx23885_dev *dev = fh->dev; |
| 1509 | 1509 | ||
| 1510 | if (unlikely(UNSET == dev->tuner_type)) | 1510 | if (dev->tuner_type == TUNER_ABSENT) |
| 1511 | return -EINVAL; | 1511 | return -EINVAL; |
| 1512 | 1512 | ||
| 1513 | /* f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */ | 1513 | /* 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 | { | 1523 | { |
| 1524 | struct v4l2_control ctrl; | 1524 | struct v4l2_control ctrl; |
| 1525 | 1525 | ||
| 1526 | if (unlikely(UNSET == dev->tuner_type)) | 1526 | if (dev->tuner_type == TUNER_ABSENT) |
| 1527 | return -EINVAL; | 1527 | return -EINVAL; |
| 1528 | if (unlikely(f->tuner != 0)) | 1528 | if (unlikely(f->tuner != 0)) |
| 1529 | return -EINVAL; | 1529 | return -EINVAL; |
