diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 17:04:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 17:04:19 -0800 |
| commit | 7d1fc01afc5af35e5197e0e75abe900f6bd279b8 (patch) | |
| tree | 4bebc92c83785335e132059d9965c8f9c0a03670 /drivers/media/dvb-frontends/si2165.c | |
| parent | 0f0836b7eb1b9d14862ee40c7856227a3ead70db (diff) | |
| parent | bcf4299e6215a475259c3ac329d43e776cfe9c0c (diff) | |
| download | op-kernel-dev-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.zip op-kernel-dev-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
floppy: make local variable non-static
exynos: fixes an incorrect header guard
dt-bindings: fixes some incorrect header guards
cpufreq-dt: correct dead link in documentation
cpufreq: ARM big LITTLE: correct dead link in documentation
treewide: Fix typos in printk
Documentation: filesystem: Fix typo in fs/eventfd.c
fs/super.c: use && instead of & for warn_on condition
Documentation: fix sysfs-ptp
lib: scatterlist: fix Kconfig description
Diffstat (limited to 'drivers/media/dvb-frontends/si2165.c')
| -rw-r--r-- | drivers/media/dvb-frontends/si2165.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c index 1cf6e52..2b93241 100644 --- 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; |
