Skip to content

Commit

Permalink
Merge branch 'eleven' into upstreamed
Browse files Browse the repository at this point in the history
  • Loading branch information
Official-Ayrton990 committed Nov 15, 2021
2 parents 3afdf70 + 9904e86 commit df9af20
Show file tree
Hide file tree
Showing 87 changed files with 572 additions and 455 deletions.
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/alioth_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
# CONFIG_SCHED_WALT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -91,7 +91,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/apollo_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
# CONFIG_SCHED_WALT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -91,7 +91,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/cas_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
CONFIG_SCHED_WALT=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -90,7 +90,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/cmi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
# CONFIG_SCHED_WALT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -91,7 +91,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/lmi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
# CONFIG_SCHED_WALT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -97,7 +97,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/thyme_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
# CONFIG_SCHED_WALT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -91,7 +91,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/configs/vendor/umi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CONFIG_SCHEDUTIL_DOWN_RATE_LIMIT=20000
CONFIG_CPU_INPUT_BOOST=y
CONFIG_INPUT_BOOST_DURATION_MS=100
CONFIG_INPUT_BOOST_FREQ_LP=1708800
CONFIG_INPUT_BOOST_FREQ_PERF=2150400
CONFIG_INPUT_BOOST_FREQ_PRIME=2553600
CONFIG_INPUT_BOOST_FREQ_PERF=2054400
CONFIG_INPUT_BOOST_FREQ_PRIME=2169600
CONFIG_MAX_BOOST_FREQ_LP=1708800
CONFIG_MAX_BOOST_FREQ_PERF=2150400
CONFIG_MAX_BOOST_FREQ_PRIME=2553600
CONFIG_MAX_BOOST_FREQ_PERF=2054400
CONFIG_MAX_BOOST_FREQ_PRIME=2169600
# CONFIG_SCHED_WALT is not set
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
Expand Down Expand Up @@ -91,7 +91,7 @@ CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_WIREGUARD=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ static int sve_set(struct task_struct *target,
const void *kbuf, const void __user *ubuf)
{
int ret;
struct user_sve_header header;
struct user_sve_header header = { 0 };
unsigned int vq;
unsigned long start, end;

Expand Down
14 changes: 7 additions & 7 deletions crypto/ecc.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ static void xycz_add(u64 *x1, u64 *y1, u64 *x2, u64 *y2, u64 *curve_prime,
unsigned int ndigits)
{
/* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
u64 t5[ECC_MAX_DIGITS];
u64 t5[ECC_MAX_DIGITS] = { 0 };

/* t5 = x2 - x1 */
vli_mod_sub(t5, x2, x1, curve_prime, ndigits);
Expand Down Expand Up @@ -791,9 +791,9 @@ static void xycz_add_c(u64 *x1, u64 *y1, u64 *x2, u64 *y2, u64 *curve_prime,
unsigned int ndigits)
{
/* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
u64 t5[ECC_MAX_DIGITS];
u64 t6[ECC_MAX_DIGITS];
u64 t7[ECC_MAX_DIGITS];
u64 t5[ECC_MAX_DIGITS] = { 0 };
u64 t6[ECC_MAX_DIGITS] = { 0 };
u64 t7[ECC_MAX_DIGITS] = { 0 };

/* t5 = x2 - x1 */
vli_mod_sub(t5, x2, x1, curve_prime, ndigits);
Expand Down Expand Up @@ -847,9 +847,9 @@ static void ecc_point_mult(struct ecc_point *result,
{
/* R0 and R1 */
u64 rx[2][ECC_MAX_DIGITS];
u64 ry[2][ECC_MAX_DIGITS];
u64 ry[2][ECC_MAX_DIGITS] = { 0 };
u64 z[ECC_MAX_DIGITS];
u64 sk[2][ECC_MAX_DIGITS];
u64 sk[2][ECC_MAX_DIGITS] = { 0 };
u64 *curve_prime = curve->p;
int i, nb;
int num_bits;
Expand Down Expand Up @@ -1074,7 +1074,7 @@ int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
{
int ret = 0;
struct ecc_point *product, *pk;
u64 priv[ECC_MAX_DIGITS];
u64 priv[ECC_MAX_DIGITS] = { 0 };
u64 rand_z[ECC_MAX_DIGITS];
unsigned int nbytes;
const struct ecc_curve *curve = ecc_get_curve(curve_id);
Expand Down
18 changes: 9 additions & 9 deletions drivers/bus/mhi/core/mhi_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -529,15 +529,15 @@ enum MHI_XFER_TYPE {
#define MHI_DEV_WAKE_DB (127)
#define MHI_MAX_MTU (0xffff)

#define MHI_TIMESYNC_DB_SETUP(er_index) ((MHI_TIMESYNC_CHAN_DB << \
TIMESYNC_CFG_CHAN_DB_ID_SHIFT) & TIMESYNC_CFG_CHAN_DB_ID_MASK | \
(1 << TIMESYNC_CFG_ENABLED_SHIFT) & TIMESYNC_CFG_ENABLED_MASK | \
((er_index) << TIMESYNC_CFG_ER_ID_SHIFT) & TIMESYNC_CFG_ER_ID_MASK)

#define MHI_BW_SCALE_SETUP(er_index) ((MHI_BW_SCALE_CHAN_DB << \
BW_SCALE_CFG_CHAN_DB_ID_SHIFT) & BW_SCALE_CFG_CHAN_DB_ID_MASK | \
(1 << BW_SCALE_CFG_ENABLED_SHIFT) & BW_SCALE_CFG_ENABLED_MASK | \
((er_index) << BW_SCALE_CFG_ER_ID_SHIFT) & BW_SCALE_CFG_ER_ID_MASK)
#define MHI_TIMESYNC_DB_SETUP(er_index) (((MHI_TIMESYNC_CHAN_DB << \
TIMESYNC_CFG_CHAN_DB_ID_SHIFT) & TIMESYNC_CFG_CHAN_DB_ID_MASK) | \
((1 << TIMESYNC_CFG_ENABLED_SHIFT) & TIMESYNC_CFG_ENABLED_MASK) | \
(((er_index) << TIMESYNC_CFG_ER_ID_SHIFT) & TIMESYNC_CFG_ER_ID_MASK))

#define MHI_BW_SCALE_SETUP(er_index) (((MHI_BW_SCALE_CHAN_DB << \
BW_SCALE_CFG_CHAN_DB_ID_SHIFT) & BW_SCALE_CFG_CHAN_DB_ID_MASK) | \
((1 << BW_SCALE_CFG_ENABLED_SHIFT) & BW_SCALE_CFG_ENABLED_MASK) | \
(((er_index) << BW_SCALE_CFG_ER_ID_SHIFT) & BW_SCALE_CFG_ER_ID_MASK))

#define MHI_BW_SCALE_RESULT(status, seq) ((status & 0xF) << 8 | (seq & 0xFF))
#define MHI_BW_SCALE_NACK 0xF
Expand Down
4 changes: 2 additions & 2 deletions drivers/bus/mhi/core/mhi_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2165,7 +2165,7 @@ int mhi_debugfs_mhi_regdump_show(struct seq_file *m, void *d)
enum mhi_dev_state state;
enum mhi_ee ee;
int i, ret;
u32 val;
u32 val = 0;
void __iomem *mhi_base = mhi_cntrl->regs;
void __iomem *bhi_base = mhi_cntrl->bhi;
void __iomem *bhie_base = mhi_cntrl->bhie;
Expand Down Expand Up @@ -2818,7 +2818,7 @@ void mhi_debug_reg_dump(struct mhi_controller *mhi_cntrl)
enum mhi_dev_state state;
enum mhi_ee ee;
int i, ret;
u32 val;
u32 val = 0;
void __iomem *mhi_base = mhi_cntrl->regs;
void __iomem *bhi_base = mhi_cntrl->bhi;
void __iomem *bhie_base = mhi_cntrl->bhie;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/adsprpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ static int context_build_overlap(struct smq_invoke_ctx *ctx)
int inbufs = REMOTE_SCALARS_INBUFS(ctx->sc);
int outbufs = REMOTE_SCALARS_OUTBUFS(ctx->sc);
int nbufs = inbufs + outbufs;
struct overlap max;
struct overlap max = { 0 };

for (i = 0; i < nbufs; ++i) {
ctx->overs[i].start = (uintptr_t)lpra[i].buf.pv;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/diag/diag_masks.c
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ static int diag_cmd_update_event_mask(unsigned char *src_buf, int src_len,
struct diag_event_mask_config_t rsp;
struct diag_event_mask_config_t *req;
struct diag_event_mask_config_sub_t rsp_sub;
struct diag_event_mask_config_sub_t *req_sub;
struct diag_event_mask_config_sub_t *req_sub = NULL;
struct diag_mask_info *mask_info = NULL;
struct diag_md_session_t *info = NULL;
struct diag_multisim_masks *ms_ptr = NULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/diag/diag_memorydevice.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int diag_md_write(int id, unsigned char *buf, int len, int ctx)
{
int i, peripheral, pid = 0, type = 0;
uint8_t found = 0;
unsigned long flags, flags_sec;
unsigned long flags, flags_sec = 0;
struct diag_md_info *ch = NULL;
struct diag_md_session_t *session_info = NULL;

Expand Down
2 changes: 1 addition & 1 deletion drivers/cpufreq/qcom-cpufreq-hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ static int qcom_cpufreq_hw_read_lut(struct platform_device *pdev,
{
struct device *dev = &pdev->dev, *cpu_dev;
void __iomem *base_freq, *base_volt;
u32 data, src, lval, i, core_count, prev_cc, prev_freq, cur_freq, volt;
u32 data, src, lval, i, core_count, prev_cc, prev_freq = 0, cur_freq, volt;
u32 vc;
unsigned long cpu;
int ret, of_len;
Expand Down
2 changes: 1 addition & 1 deletion drivers/esoc/esoc_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static long esoc_dev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
int err;
u32 esoc_cmd, status, req, evt;
u32 esoc_cmd, status, req = 0, evt;
struct esoc_uhandle *uhandle = file->private_data;
struct esoc_udev *esoc_udev = uhandle->esoc_udev;
struct esoc_clink *esoc_clink = uhandle->esoc_clink;
Expand Down
2 changes: 1 addition & 1 deletion drivers/firmware/arm_scmi/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ int scmi_version_get(const struct scmi_handle *handle, u8 protocol,
{
int ret;
__le32 *rev_info;
struct scmi_xfer *t;
struct scmi_xfer *t = NULL;

ret = scmi_xfer_get_init(handle, PROTOCOL_VERSION, protocol, 0,
sizeof(*version), &t);
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/evdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
struct evdev_client *client = file->private_data;
struct evdev *evdev = client->evdev;
struct input_dev *dev = evdev->handle.dev;
struct input_absinfo abs;
struct input_absinfo abs = { 0 };
struct input_mask mask;
struct ff_effect effect;
int __user *ip = (int __user *)p;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4560,7 +4560,7 @@ EXPORT_SYMBOL(synaptics_rmi4_new_function);

static int synaptics_rmi4_probe(struct platform_device *pdev)
{
int retval;
int retval = 0;
struct synaptics_rmi4_data *rmi4_data;
const struct synaptics_dsx_hw_interface *hw_if;
const struct synaptics_dsx_board_data *bdata;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3200,7 +3200,7 @@ static void test_set_data(void)
static int test_set_controls(void)
{
int retval;
unsigned char length;
unsigned char length = '\0';
unsigned char num_of_sensing_freqs;
unsigned short reg_addr = f54->control_base_addr;
struct f54_control *control = &f54->control;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb-core/dvb_demux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1674,7 +1674,7 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf,
{
int p = 0, i = 0, j = 0;
const u8 *q;
ktime_t pre_time;
ktime_t pre_time = 0;
u8 timestamp[TIMESTAMP_LEN];
unsigned long flags;

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/msm/cvp/msm_cvp.c
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ static int msm_cvp_map_buf(struct msm_cvp_inst *inst,
int i, rc = 0;
u32 version;
unsigned int iova;
u64 ktid;
u64 ktid = 0;
struct msm_cvp_frame *frame;

version = get_hfi_version();
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/msm/cvp/msm_v4l2_private.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static void _set_deprecate_bitmask(struct cvp_kmd_arg *kp,
static void print_hfi_short(struct cvp_kmd_arg __user *up)
{
struct cvp_kmd_hfi_packet *pkt;
unsigned int words[5];
unsigned int words[5] = { 0 };

pkt = &up->data.hfi_pkt;
if (get_user(words[0], &up->type) ||
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/radio/rtc6226/radio-rtc6226-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static void rtc6226_update_af_list(struct rtc6226_device *radio)
u8 i = 0;
u8 af_data = radio->block[2] >> 8;
u32 af_freq_khz;
u32 tuned_freq_khz;
u32 tuned_freq_khz = 0;
struct kfifo *buff;
struct af_list_ev ev;
spinlock_t lock = radio->buf_lock[RTC6226_FM_BUF_AF_LIST];
Expand Down Expand Up @@ -2238,7 +2238,7 @@ static int rtc6226_vidioc_g_frequency(struct file *file, void *priv,
{
struct rtc6226_device *radio = video_drvdata(file);
int retval = 0;
unsigned int frq;
unsigned int frq = 0;

FMDBG("%s enter freq %d\n", __func__, freq->frequency);

Expand Down
Loading

0 comments on commit df9af20

Please sign in to comment.