mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Usual trivial tree updates. Nothing outstanding -- mostly printk() and comment fixes and unused identifier removals" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: goldfish: goldfish_tty_probe() is not using 'i' any more powerpc: Fix comment in smu.h qla2xxx: Fix printks in ql_log message lib: correct link to the original source for div64_u64 si2168, tda10071, m88ds3103: Fix firmware wording usb: storage: Fix printk in isd200_log_config() qla2xxx: Fix printk in qla25xx_setup_mode init/main: fix reset_device comment ipwireless: missing assignment goldfish: remove unreachable line of code coredump: Fix do_coredump() comment stacktrace.h: remove duplicate declaration task_struct smpboot.h: Remove unused function prototype treewide: Fix typo in printk messages treewide: Fix typo in printk messages mod_devicetable: fix comment for match_flags
This commit is contained in:
commit
d0bbe0dd35
46 changed files with 54 additions and 59 deletions
|
|
@ -630,7 +630,7 @@ static int m88ds3103_init(struct dvb_frontend *fe)
|
|||
/* request the firmware, this will block and timeout */
|
||||
ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);
|
||||
if (ret) {
|
||||
dev_err(&priv->i2c->dev, "%s: firmare file '%s' not found\n",
|
||||
dev_err(&priv->i2c->dev, "%s: firmware file '%s' not found\n",
|
||||
KBUILD_MODNAME, fw_file);
|
||||
goto err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ struct si2168_dev {
|
|||
bool ts_clock_inv;
|
||||
};
|
||||
|
||||
/* firmare command struct */
|
||||
/* firmware command struct */
|
||||
#define SI2168_ARGLEN 30
|
||||
struct si2168_cmd {
|
||||
u8 args[SI2168_ARGLEN];
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ struct tda10071_reg_val_mask {
|
|||
#define CMD_BER_CONTROL 0x3e
|
||||
#define CMD_BER_UPDATE_COUNTERS 0x3f
|
||||
|
||||
/* firmare command struct */
|
||||
/* firmware command struct */
|
||||
#define TDA10071_ARGLEN 30
|
||||
struct tda10071_cmd {
|
||||
u8 args[TDA10071_ARGLEN];
|
||||
|
|
|
|||
|
|
@ -408,7 +408,7 @@ static int msi001_s_ctrl(struct v4l2_ctrl *ctrl)
|
|||
s->mixer_gain->cur.val, s->if_gain->val);
|
||||
break;
|
||||
default:
|
||||
dev_dbg(&s->spi->dev, "unkown control %d\n", ctrl->id);
|
||||
dev_dbg(&s->spi->dev, "unknown control %d\n", ctrl->id);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue