Merge remote-tracking branch 'sm8250/lineage-20' into lineage-22.2
* sm8250/lineage-20: FROMLIST: rpmsg: qcom_smd: Fix fallback to qcom,ipc parse soc: qcom: smp2p: Fix fallback to qcom,ipc parse Change-Id: I38b763796522375c3a797c32b45cecede10b496f
This commit is contained in:
2 files changed
+2
-2
No files matched your search
@@ -1543,7 +1543,7 @@ static int qcom_smd_parse_edge(struct device *dev,
|
||||
edge->mbox_client.knows_txdone = true;
|
||||
edge->mbox_chan = mbox_request_channel(&edge->mbox_client, 0);
|
||||
if (IS_ERR(edge->mbox_chan)) {
|
||||
if (PTR_ERR(edge->mbox_chan) != -ENODEV) {
|
||||
if (PTR_ERR(edge->mbox_chan) != -ENOENT) {
|
||||
ret = PTR_ERR(edge->mbox_chan);
|
||||
goto put_node;
|
||||
}
|
||||
|
||||
@@ -616,7 +616,7 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
|
||||
smp2p->mbox_client.knows_txdone = true;
|
||||
smp2p->mbox_chan = mbox_request_channel(&smp2p->mbox_client, 0);
|
||||
if (IS_ERR(smp2p->mbox_chan)) {
|
||||
if (PTR_ERR(smp2p->mbox_chan) != -ENODEV)
|
||||
if (PTR_ERR(smp2p->mbox_chan) != -ENOENT)
|
||||
return PTR_ERR(smp2p->mbox_chan);
|
||||
|
||||
smp2p->mbox_chan = NULL;
|
||||
|
||||
Reference in new issue
Block a user