Commit ccffeae7 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge branch 'v5.7-fixes' of...

Merge branch 'v5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/fixes

* 'v5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: cmdq: return send msg error code
  arm64: dts: mt8173: fix vcodec-enc clock

Link: https://lore.kernel.org/r/33a0556a-e2a3-7f0b-b09b-4516642a4bfe@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ed9dc1df 34c4e407
...@@ -1402,8 +1402,8 @@ vcodec_enc: vcodec@18002000 { ...@@ -1402,8 +1402,8 @@ vcodec_enc: vcodec@18002000 {
"venc_lt_sel"; "venc_lt_sel";
assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>, assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,
<&topckgen CLK_TOP_VENC_LT_SEL>; <&topckgen CLK_TOP_VENC_LT_SEL>;
assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>, assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL>,
<&topckgen CLK_TOP_UNIVPLL1_D2>; <&topckgen CLK_TOP_VCODECPLL_370P5>;
}; };
jpegdec: jpegdec@18004000 { jpegdec: jpegdec@18004000 {
......
...@@ -351,7 +351,9 @@ int cmdq_pkt_flush_async(struct cmdq_pkt *pkt, cmdq_async_flush_cb cb, ...@@ -351,7 +351,9 @@ int cmdq_pkt_flush_async(struct cmdq_pkt *pkt, cmdq_async_flush_cb cb,
spin_unlock_irqrestore(&client->lock, flags); spin_unlock_irqrestore(&client->lock, flags);
} }
mbox_send_message(client->chan, pkt); err = mbox_send_message(client->chan, pkt);
if (err < 0)
return err;
/* We can send next packet immediately, so just call txdone. */ /* We can send next packet immediately, so just call txdone. */
mbox_client_txdone(client->chan, 0); mbox_client_txdone(client->chan, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment