diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2013-09-30 17:34:48 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-10-28 21:25:02 +0400 |
| commit | 927933f7b4b213357813b394ca66f7a6ce3d28f2 (patch) | |
| tree | e1daec59bd7fabbff86a1ed91a801deafeba2198 /drivers | |
| parent | 0fd84dc80bfdcbe8345959100c8ad776dff75d5e (diff) | |
| download | linux-927933f7b4b213357813b394ca66f7a6ce3d28f2.tar.xz | |
[media] coda: move coda_product_name above vidioc_querycap
Use the product name (currently CodaDx6 or CODA7541)
to fill the v4l2_capabilities.name field.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/coda.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 5fe947c3b1f7..e70a2728cd6b 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -394,14 +394,32 @@ static struct coda_codec *coda_find_codec(struct coda_dev *dev, int src_fourcc, return &codecs[k]; } +static char *coda_product_name(int product) +{ + static char buf[9]; + + switch (product) { + case CODA_DX6: + return "CodaDx6"; + case CODA_7541: + return "CODA7541"; + default: + snprintf(buf, sizeof(buf), "(0x%04x)", product); + return buf; + } +} + /* * V4L2 ioctl() operations. */ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { + struct coda_ctx *ctx = fh_to_ctx(priv); + strlcpy(cap->driver, CODA_NAME, sizeof(cap->driver)); - strlcpy(cap->card, CODA_NAME, sizeof(cap->card)); + strlcpy(cap->card, coda_product_name(ctx->dev->devtype->product), + sizeof(cap->card)); strlcpy(cap->bus_info, "platform:" CODA_NAME, sizeof(cap->bus_info)); /* * This is only a mem-to-mem video device. The capture and output @@ -2868,21 +2886,6 @@ static bool coda_firmware_supported(u32 vernum) return false; } -static char *coda_product_name(int product) -{ - static char buf[9]; - - switch (product) { - case CODA_DX6: - return "CodaDx6"; - case CODA_7541: - return "CODA7541"; - default: - snprintf(buf, sizeof(buf), "(0x%04x)", product); - return buf; - } -} - static int coda_hw_init(struct coda_dev *dev) { u16 product, major, minor, release; |