Skip to content

Commit

Permalink
Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Jun 12, 2019
2 parents aa72354 + a200c72 commit 35110e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/media/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/qcom/venus/hfi_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 35110e3

Please sign in to comment.