Merge tag 'v5.3-rc4' into patchwork

[linux.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 d535aac68ce168c37fb8542cbfa2599a056b3686..53315c8dd2bbcdae80bcc44174e7bd296cf6c393 100644 (file)
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -792,7 +792,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
        if (no_error_inj && ccs_cap == -1)
                ccs_cap = 7;
 
-       /* if ccs_cap == -1, then the use can select it using controls */
+       /* if ccs_cap == -1, then the user can select it using controls */
        if (ccs_cap != -1) {
                dev->has_crop_cap = ccs_cap & 1;
                dev->has_compose_cap = ccs_cap & 2;
@@ -807,7 +807,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
        if (no_error_inj && ccs_out == -1)
                ccs_out = 7;
 
-       /* if ccs_out == -1, then the use can select it using controls */
+       /* if ccs_out == -1, then the user can select it using controls */
        if (ccs_out != -1) {
                dev->has_crop_out = ccs_out & 1;
                dev->has_compose_out = ccs_out & 2;