Re: [PATCH] Bluetooth: btqcomsmd: Fix channel open check

From: Marcel Holtmann
Date: Wed Feb 28 2018 - 01:25:27 EST


Hi Bjorn,

> rpmsg_create_ept() returns NULL on error and as such
> qcom_wcnss_open_channel() does the same. Clarify this in the
> kernel-doc and correct the error checks in btqcomsmd.
>
> Fixes: 1511cc750c3d ("Bluetooth: Introduce Qualcomm WCNSS SMD based HCI driver")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> drivers/bluetooth/btqcomsmd.c | 8 ++++----
> drivers/soc/qcom/wcnss_ctrl.c | 2 ++
> 2 files changed, 6 insertions(+), 4 deletions(-)

I think you better split this into two separate patches so they can go via its subsystems independently.

>
> diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
> index 2c9a5fc9137d..24f702927875 100644
> --- a/drivers/bluetooth/btqcomsmd.c
> +++ b/drivers/bluetooth/btqcomsmd.c
> @@ -151,13 +151,13 @@ static int btqcomsmd_probe(struct platform_device *pdev)
>
> btq->acl_channel = qcom_wcnss_open_channel(wcnss, "APPS_RIVA_BT_ACL",
> btqcomsmd_acl_callback, btq);
> - if (IS_ERR(btq->acl_channel))
> - return PTR_ERR(btq->acl_channel);
> + if (!btq->acl_channel)
> + return -ENOENT;
>
> btq->cmd_channel = qcom_wcnss_open_channel(wcnss, "APPS_RIVA_BT_CMD",
> btqcomsmd_cmd_callback, btq);
> - if (IS_ERR(btq->cmd_channel))
> - return PTR_ERR(btq->cmd_channel);
> + if (!btq->cmd_channel)
> + return -ENOENT;

Any reason not to fix qcom_wcnss_open_channel to use PTR_ERR?

Regards

Marcel