Skip to content

Commit 35110e3

Browse files
committed
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
2 parents aa72354 + a200c72 commit 35110e3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/media/dvb-core/dvb_frontend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ static void dvb_frontend_get_frequency_limits(struct dvb_frontend *fe,
905905
"DVB: adapter %i frontend %u frequency limits undefined - fix the driver\n",
906906
fe->dvb->num, fe->id);
907907

908-
dprintk("frequency interval: tuner: %u...%u, frontend: %u...%u",
908+
dev_dbg(fe->dvb->device, "frequency interval: tuner: %u...%u, frontend: %u...%u",
909909
tuner_min, tuner_max, frontend_min, frontend_max);
910910

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ struct hfi_capability {
560560

561561
struct hfi_capabilities {
562562
u32 num_capabilities;
563-
struct hfi_capability *data;
563+
struct hfi_capability data[];
564564
};
565565

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

718718
struct hfi_profile_level_supported {
719719
u32 profile_count;
720-
struct hfi_profile_level *profile_level;
720+
struct hfi_profile_level profile_level[];
721721
};
722722

723723
struct hfi_quality_vs_speed {

0 commit comments

Comments
 (0)