2021-10-29 09:55:40

by Jiapeng Chong

Subject: [PATCH] wlwifi: Fix missing error code in iwl_pci_probe()

From: chongjiapeng <[email protected]>

The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'ret'.

Eliminate the follow smatch warning:

drivers/net/wireless/intel/iwlwifi/pcie/drv.c:1376 iwl_pci_probe() warn:
missing error code 'ret'.

Reported-by: Abaci Robot <[email protected]>
Fixes: 1f171f4f1437 ("iwlwifi: Add support for getting rf id with blank otp")
Signed-off-by: chongjiapeng <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index cff76a528967..33250d24c2b9 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1442,9 +1442,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
if (iwl_trans->trans_cfg->rf_id &&
iwl_trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&
- !CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) && get_crf_id(iwl_trans))
+ !CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) && get_crf_id(iwl_trans)) {
ret = -EINVAL;
goto out_free_trans;
+ }

dev_info = iwl_pci_find_dev_info(pdev->device, pdev->subsystem_device,
CSR_HW_REV_TYPE(iwl_trans->hw_rev),
--
2.19.1.6.gb485710b

2021-10-29 13:12:27

by Kalle Valo

Subject: Re: [PATCH] wlwifi: Fix missing error code in iwl_pci_probe()

Jiapeng Chong <[email protected]> writes:

> From: chongjiapeng <[email protected]>
>
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'ret'.
>
> Eliminate the follow smatch warning:
>
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c:1376 iwl_pci_probe() warn:
> missing error code 'ret'.
>
> Reported-by: Abaci Robot <[email protected]>
> Fixes: 1f171f4f1437 ("iwlwifi: Add support for getting rf id with blank otp")
> Signed-off-by: chongjiapeng <[email protected]>

The subject prefix should be "iwlwifi: ".

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2021-10-29 19:45:00

by Luciano Coelho

Subject: Re: [PATCH] wlwifi: Fix missing error code in iwl_pci_probe()

On Fri, 2021-10-29 at 17:55 +0800, Jiapeng Chong wrote:
> From: chongjiapeng <[email protected]>
>
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'ret'.
>
> Eliminate the follow smatch warning:
>
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c:1376 iwl_pci_probe() warn:
> missing error code 'ret'.
>
> Reported-by: Abaci Robot <[email protected]>
> Fixes: 1f171f4f1437 ("iwlwifi: Add support for getting rf id with blank otp")
> Signed-off-by: chongjiapeng <[email protected]>
> ---
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> index cff76a528967..33250d24c2b9 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> @@ -1442,9 +1442,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> */
> if (iwl_trans->trans_cfg->rf_id &&
> iwl_trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_9000 &&
> - !CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) && get_crf_id(iwl_trans))
> + !CSR_HW_RFID_TYPE(iwl_trans->hw_rf_id) && get_crf_id(iwl_trans)) {
> ret = -EINVAL;
> goto out_free_trans;
> + }
>
> dev_info = iwl_pci_find_dev_info(pdev->device, pdev->subsystem_device,
> CSR_HW_REV_TYPE(iwl_trans->hw_rev),

Thanks for your patch!

The commit description makes sense. But the patch itself is wrong. It
seems to be fixing an earlier attempt at fixing the issue, where the
ret = -EINVAL was added, but the braces were missing (which is what
this patch adds).

So, this patch is incomplete and won't apply as is. Can you please fix
it?

--
Luca.