diff mbox

[3/3,media] venus: fix compile-test build on non-qcom ARM platform

Message ID CAK8P3a2ckb8MGhvnfLbFM1gf7T95i0Xi+00_GDBtu2LSoA8m_g@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann June 28, 2017, 8:25 p.m. UTC 
On Tue, Jun 27, 2017 at 9:45 PM, Stanimir Varbanov
<stanimir.varbanov@linaro.org> wrote:
> Hi Arnd,
>
> On 27.06.2017 18:02, Arnd Bergmann wrote:
>>
>> If QCOM_MDT_LOADER is enabled, but ARCH_QCOM is not, we run into
>> a build error:
>>
>> ERROR: "qcom_mdt_load" [drivers/media/platform/qcom/venus/venus-core.ko]
>> undefined!
>> ERROR: "qcom_mdt_get_size"
>> [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
>
>
> Ahh, thanks for the fix, these two will also pursuing me in my dreams.

I just came after me as well, as I hit another corner case, we need this
fixup on top, I'll send a replacement:

Subject: [PATCH] fixup! [media] venus: fix compile-test  build on
non-qcom ARM platform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

  fw_dev->parent = parent;
diff mbox

Patch

diff --git a/drivers/media/platform/qcom/venus/firmware.c
b/drivers/media/platform/qcom/venus/firmware.c
index 76edb9f60311..3794b9e3250b 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -40,7 +40,7 @@  int venus_boot(struct device *parent, struct device
*fw_dev, const char *fwname)
  void *mem_va;
  int ret;

- if (!qcom_scm_is_available())
+ if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || !qcom_scm_is_available())
  return -EPROBE_DEFER;