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

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

diff --combined drivers/media/dvb-core/dvb_frontend.c
index ecd3277f2e895b39a0c2e46edb81a70c53a25113,7402c9834189a8b561922e6a80832187a0d99d68..6351a97f3d1877c8ccf378c4fefb4aeabc520e5a
--- 1/drivers/media/dvb-core/dvb_frontend.c
--- 2/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@@ -1,13 -1,25 +1,13 @@@
 +// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * dvb_frontend.c: DVB frontend tuning interface/thread
   *
 - *
   * Copyright (C) 1999-2001 Ralph  Metzler
   *                       Marcus Metzler
   *                       Holger Waechtler
   *                                  for convergence integrated media GmbH
   *
   * Copyright (C) 2004 Andrew de Quincey (tuning thread cleanup)
 - *
 - * This program is free software; you can redistribute it and/or
 - * modify it under the terms of the GNU General Public License
 - * as published by the Free Software Foundation; either version 2
 - * of the License, or (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.        See the
 - * GNU General Public License for more details.
 - * To obtain the license, point your browser to
 - * http://www.gnu.org/copyleft/gpl.html
   */
  
  /* Enables DVBv3 compatibility bits at the headers */
@@@ -905,7 -917,7 +905,7 @@@ static void dvb_frontend_get_frequency_
                         "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 */

diff --combined drivers/media/platform/qcom/venus/hfi_helper.h
index 04cc80b106d60b646e8e46f03436c9f124185e52,a2b95ff79c4a7af40c4695932dbcccec8b413987..b70551e296b7ae6b11a68e7a98a7a3b780606251
--- 1/drivers/media/platform/qcom/venus/hfi_helper.h
--- 2/drivers/media/platform/qcom/venus/hfi_helper.h
+++ b/drivers/media/platform/qcom/venus/hfi_helper.h
@@@ -1,7 -1,16 +1,7 @@@
 +/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
   * Copyright (C) 2017 Linaro Ltd.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 and
 - * only version 2 as published by the Free Software Foundation.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
   */
  #ifndef __VENUS_HFI_HELPER_H__
  #define __VENUS_HFI_HELPER_H__
@@@ -560,7 -569,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 -726,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 {