aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vivid/vivid-vid-cap.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/vivid/vivid-vid-cap.c')
-rw-r--r--drivers/media/platform/vivid/vivid-vid-cap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index 1d9ea2d9d61a..c942bf7ac95a 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -1585,13 +1585,13 @@ int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh,
1585 1585
1586 if (!vivid_is_hdmi_cap(dev)) 1586 if (!vivid_is_hdmi_cap(dev))
1587 return -ENODATA; 1587 return -ENODATA;
1588 if (vb2_is_busy(&dev->vb_vid_cap_q))
1589 return -EBUSY;
1590 if (!v4l2_find_dv_timings_cap(timings, &vivid_dv_timings_cap, 1588 if (!v4l2_find_dv_timings_cap(timings, &vivid_dv_timings_cap,
1591 0, NULL, NULL)) 1589 0, NULL, NULL))
1592 return -EINVAL; 1590 return -EINVAL;
1593 if (v4l2_match_dv_timings(timings, &dev->dv_timings_cap, 0)) 1591 if (v4l2_match_dv_timings(timings, &dev->dv_timings_cap, 0))
1594 return 0; 1592 return 0;
1593 if (vb2_is_busy(&dev->vb_vid_cap_q))
1594 return -EBUSY;
1595 dev->dv_timings_cap = *timings; 1595 dev->dv_timings_cap = *timings;
1596 vivid_update_format_cap(dev, false); 1596 vivid_update_format_cap(dev, false);
1597 return 0; 1597 return 0;