Skip to content

Commit 876685c

Browse files
committed
Merge tag 'media/v6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: - fix a clang build issue with mediatec vcodec - add missing variable initialization to dib3000mb write function * tag 'media/v6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef noinline media: dvb-frontends: dib3000mb: fix uninit-value in dib3000_write_reg
2 parents a99b4a3 + 8b55f88 commit 876685c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/media/dvb-frontends/dib3000mb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-a
5151
static int dib3000_read_reg(struct dib3000_state *state, u16 reg)
5252
{
5353
u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff };
54-
u8 rb[2];
54+
u8 rb[2] = {};
5555
struct i2c_msg msg[] = {
5656
{ .addr = state->config.demod_address, .flags = 0, .buf = wb, .len = 2 },
5757
{ .addr = state->config.demod_address, .flags = I2C_M_RD, .buf = rb, .len = 2 },

drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
11881188
return ret;
11891189
}
11901190

1191-
static
1191+
/* clang stack usage explodes if this is inlined */
1192+
static noinline_for_stack
11921193
void vdec_vp9_slice_map_counts_eob_coef(unsigned int i, unsigned int j, unsigned int k,
11931194
struct vdec_vp9_slice_frame_counts *counts,
11941195
struct v4l2_vp9_frame_symbol_counts *counts_helper)

0 commit comments

Comments
 (0)