.. | .. |
---|
385 | 385 | struct delta_ctx *ctx = to_ctx(file->private_data); |
---|
386 | 386 | struct delta_dev *delta = ctx->dev; |
---|
387 | 387 | |
---|
388 | | - strlcpy(cap->driver, DELTA_NAME, sizeof(cap->driver)); |
---|
389 | | - strlcpy(cap->card, delta->vdev->name, sizeof(cap->card)); |
---|
| 388 | + strscpy(cap->driver, DELTA_NAME, sizeof(cap->driver)); |
---|
| 389 | + strscpy(cap->card, delta->vdev->name, sizeof(cap->card)); |
---|
390 | 390 | snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", |
---|
391 | 391 | delta->pdev->name); |
---|
392 | 392 | |
---|
.. | .. |
---|
1783 | 1783 | snprintf(vdev->name, sizeof(vdev->name), "%s-%s", |
---|
1784 | 1784 | DELTA_NAME, DELTA_FW_VERSION); |
---|
1785 | 1785 | |
---|
1786 | | - ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); |
---|
| 1786 | + ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); |
---|
1787 | 1787 | if (ret) { |
---|
1788 | 1788 | dev_err(delta->dev, "%s failed to register video device\n", |
---|
1789 | 1789 | DELTA_PREFIX); |
---|
.. | .. |
---|
1862 | 1862 | if (ret) { |
---|
1863 | 1863 | dev_err(delta->dev, "%s failed to initialize firmware ipc channel\n", |
---|
1864 | 1864 | DELTA_PREFIX); |
---|
1865 | | - goto err; |
---|
| 1865 | + goto err_pm_disable; |
---|
1866 | 1866 | } |
---|
1867 | 1867 | |
---|
1868 | 1868 | /* register all available decoders */ |
---|
.. | .. |
---|
1876 | 1876 | if (ret) { |
---|
1877 | 1877 | dev_err(delta->dev, "%s failed to register V4L2 device\n", |
---|
1878 | 1878 | DELTA_PREFIX); |
---|
1879 | | - goto err; |
---|
| 1879 | + goto err_pm_disable; |
---|
1880 | 1880 | } |
---|
1881 | 1881 | |
---|
1882 | 1882 | delta->work_queue = create_workqueue(DELTA_NAME); |
---|
.. | .. |
---|
1901 | 1901 | destroy_workqueue(delta->work_queue); |
---|
1902 | 1902 | err_v4l2: |
---|
1903 | 1903 | v4l2_device_unregister(&delta->v4l2_dev); |
---|
| 1904 | +err_pm_disable: |
---|
| 1905 | + pm_runtime_disable(dev); |
---|
1904 | 1906 | err: |
---|
1905 | 1907 | return ret; |
---|
1906 | 1908 | } |
---|