Commit 35110e38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:

 - a debug warning for satellite tuning at dvb core was producing too
   much noise

 - a regression at hfi_parser on Venus driver

* tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: venus: hfi_parser: fix a regression in parser
  media: dvb: warning about dvb frequency limits produces too much noise
parents aa723548 a200c721

drivers/media/dvb-core/dvb_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static void dvb_frontend_get_frequency_limits(struct dvb_frontend *fe, 
			 "DVB: adapter %i frontend %u frequency limits undefined - fix the driver\n",

			 fe->dvb->num, fe->id);



	dprintk("frequency interval: tuner: %u...%u, frontend: %u...%u",

	dev_dbg(fe->dvb->device, "frequency interval: tuner: %u...%u, frontend: %u...%u",

		tuner_min, tuner_max, frontend_min, frontend_max);



	/* If the standard is for satellite, convert frequencies to kHz */

drivers/media/platform/qcom/venus/hfi_helper.h

+2 −2
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ struct hfi_capability { 


struct hfi_capabilities {

	u32 num_capabilities;

	struct hfi_capability *data;

	struct hfi_capability data[];

};



#define HFI_DEBUG_MSG_LOW	0x01
@@ -717,7 +717,7 @@ struct hfi_profile_level { 


struct hfi_profile_level_supported {

	u32 profile_count;

	struct hfi_profile_level *profile_level;

	struct hfi_profile_level profile_level[];

};



struct hfi_quality_vs_speed {

CRA Git | Maintained and supported by SUSTech CRA and CCSE