diff options
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ioctl.c')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index c9d9f01d21bc..68e6b5e912ff 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c | |||
@@ -1813,12 +1813,7 @@ static int v4l_dbg_g_chip_info(const struct v4l2_ioctl_ops *ops, | |||
1813 | p->flags |= V4L2_CHIP_FL_WRITABLE; | 1813 | p->flags |= V4L2_CHIP_FL_WRITABLE; |
1814 | if (ops->vidioc_g_register) | 1814 | if (ops->vidioc_g_register) |
1815 | p->flags |= V4L2_CHIP_FL_READABLE; | 1815 | p->flags |= V4L2_CHIP_FL_READABLE; |
1816 | if (vfd->v4l2_dev) | 1816 | strlcpy(p->name, vfd->v4l2_dev->name, sizeof(p->name)); |
1817 | strlcpy(p->name, vfd->v4l2_dev->name, sizeof(p->name)); | ||
1818 | else if (vfd->parent) | ||
1819 | strlcpy(p->name, vfd->parent->driver->name, sizeof(p->name)); | ||
1820 | else | ||
1821 | strlcpy(p->name, "bridge", sizeof(p->name)); | ||
1822 | if (ops->vidioc_g_chip_info) | 1817 | if (ops->vidioc_g_chip_info) |
1823 | return ops->vidioc_g_chip_info(file, fh, arg); | 1818 | return ops->vidioc_g_chip_info(file, fh, arg); |
1824 | if (p->match.addr) | 1819 | if (p->match.addr) |