Commit 876685ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a99b4a36 8b55f881

drivers/media/dvb-frontends/dib3000mb.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-a 
static int dib3000_read_reg(struct dib3000_state *state, u16 reg)

{

	u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff };

	u8 rb[2];

	u8 rb[2] = {};

	struct i2c_msg msg[] = {

		{ .addr = state->config.demod_address, .flags = 0,        .buf = wb, .len = 2 },

		{ .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

+2 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance, 
	return ret;

}



static

/* clang stack usage explodes if this is inlined */

static noinline_for_stack

void vdec_vp9_slice_map_counts_eob_coef(unsigned int i, unsigned int j, unsigned int k,

					struct vdec_vp9_slice_frame_counts *counts,

					struct v4l2_vp9_frame_symbol_counts *counts_helper)