Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / drivers / media / dvb-frontends / si2165.c

diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index 1cf6e52e010512123af9d5fb39491d97c1f63522..2b93241d4bc102618c722107477b08482c7d86bb 100644 (file)
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -541,7 +541,7 @@ static int si2165_upload_firmware(struct si2165_state *state)
                                           &offset, block_count);
        if (ret < 0) {
                dev_err(&state->i2c->dev,
-                       "%s: firmare could not be uploaded\n",
+                       "%s: firmware could not be uploaded\n",
                        KBUILD_MODNAME);
                goto error;
        }
@@ -565,7 +565,7 @@ static int si2165_upload_firmware(struct si2165_state *state)
 
        if (len != offset) {
                dev_err(&state->i2c->dev,
-                       "%s: firmare len mismatch %04x != %04x\n",
+                       "%s: firmware len mismatch %04x != %04x\n",
                        KBUILD_MODNAME, len, offset);
                ret = -EINVAL;
                goto error;