Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds...

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / ov9640.c

diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 53d88a2ab92061031fe01d1b2d11eba14fcacfce..5173ac449dd82c4b9c764c737cf20a328b53a01b 100644 (file)
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -273,7 +273,7 @@ static int ov9640_reset(struct i2c_client *client)
        ret = ov9640_reg_write(client, OV9640_COM7, OV9640_COM7_SCCB_RESET);
        if (ret)
                dev_err(&client->dev,
-                       "An error occured while entering soft reset!\n");
+                       "An error occurred while entering soft reset!\n");
 
        return ret;
 }