Commit d9109bef authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab

V4L/DVB (11076): au0828: make g_chip_ident call work properly

Make the g_chip_ident call work for the au0828/au8522.  Discovered when testing
with the v4l2_compliance tool
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
[mchehab@redhat.com: fix merge conflict, due to a path change for analog demod]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b80f770a
...@@ -636,6 +636,7 @@ static int au8522_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) ...@@ -636,6 +636,7 @@ static int au8522_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
break; break;
} }
qc->type = 0;
return -EINVAL; return -EINVAL;
} }
......
...@@ -1348,7 +1348,15 @@ static int vidioc_g_chip_ident(struct file *file, void *priv, ...@@ -1348,7 +1348,15 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
chip->ident = V4L2_IDENT_NONE; chip->ident = V4L2_IDENT_NONE;
chip->revision = 0; chip->revision = 0;
if (v4l2_chip_match_host(&chip->match)) {
chip->ident = V4L2_IDENT_AU0828;
return 0;
}
au0828_call_i2c_clients(dev, VIDIOC_DBG_G_CHIP_IDENT, chip); au0828_call_i2c_clients(dev, VIDIOC_DBG_G_CHIP_IDENT, chip);
if (chip->ident == V4L2_IDENT_NONE)
return -EINVAL;
return 0; return 0;
} }
......
...@@ -70,6 +70,9 @@ enum { ...@@ -70,6 +70,9 @@ enum {
V4L2_IDENT_CX23416 = 416, V4L2_IDENT_CX23416 = 416,
V4L2_IDENT_CX23418 = 418, V4L2_IDENT_CX23418 = 418,
/* module au0828 */
V4L2_IDENT_AU0828 = 828,
/* module indycam: just ident 2000 */ /* module indycam: just ident 2000 */
V4L2_IDENT_INDYCAM = 2000, V4L2_IDENT_INDYCAM = 2000,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment