Merge tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / drivers / media / platform / vivid / vivid-core.c

diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index c8023959208848bbf2b52687573b0fa902056dea..9f036c5f51b09ecced19273e62761fb9f6670369 100644 (file)
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -995,7 +995,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
 
        dev->edid_max_blocks = dev->edid_blocks = 2;
        memcpy(dev->edid, vivid_hdmi_edid, sizeof(vivid_hdmi_edid));
-       ktime_get_ts(&dev->radio_rds_init_ts);
+       dev->radio_rds_init_time = ktime_get();
 
        /* create all controls */
        ret = vivid_create_controls(dev, ccs_cap == -1, ccs_out == -1, no_error_inj,