[PATCH -next] xen-pciback: Fix return in pm_ctrl_init()

YueHaibing posted 1 patch 2 years, 6 months ago
Failed in applying to current master (apply log)
drivers/xen/xen-pciback/conf_space_capability.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH -next] xen-pciback: Fix return in pm_ctrl_init()
Posted by YueHaibing 2 years, 6 months ago
Return NULL instead of passing to ERR_PTR while err is zero,
this fix smatch warnings:
drivers/xen/xen-pciback/conf_space_capability.c:163
 pm_ctrl_init() warn: passing zero to 'ERR_PTR'

Fixes: a92336a1176b ("xen/pciback: Drop two backends, squash and cleanup some code.")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/xen/xen-pciback/conf_space_capability.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/xen/xen-pciback/conf_space_capability.c b/drivers/xen/xen-pciback/conf_space_capability.c
index 22f13abbe913..5e53b4817f16 100644
--- a/drivers/xen/xen-pciback/conf_space_capability.c
+++ b/drivers/xen/xen-pciback/conf_space_capability.c
@@ -160,7 +160,7 @@ static void *pm_ctrl_init(struct pci_dev *dev, int offset)
 	}
 
 out:
-	return ERR_PTR(err);
+	return err ? ERR_PTR(err) : NULL;
 }
 
 static const struct config_field caplist_pm[] = {
-- 
2.17.1


Re: [PATCH -next] xen-pciback: Fix return in pm_ctrl_init()
Posted by Juergen Gross 2 years, 6 months ago
On 08.10.21 09:44, YueHaibing wrote:
> Return NULL instead of passing to ERR_PTR while err is zero,
> this fix smatch warnings:
> drivers/xen/xen-pciback/conf_space_capability.c:163
>   pm_ctrl_init() warn: passing zero to 'ERR_PTR'
> 
> Fixes: a92336a1176b ("xen/pciback: Drop two backends, squash and cleanup some code.")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen
Re: [PATCH -next] xen-pciback: Fix return in pm_ctrl_init()
Posted by Boris Ostrovsky 2 years, 6 months ago
On 10/8/21 11:01 AM, Juergen Gross wrote:
> On 08.10.21 09:44, YueHaibing wrote:
>> Return NULL instead of passing to ERR_PTR while err is zero,
>> this fix smatch warnings:
>> drivers/xen/xen-pciback/conf_space_capability.c:163
>>   pm_ctrl_init() warn: passing zero to 'ERR_PTR'
>>
>> Fixes: a92336a1176b ("xen/pciback: Drop two backends, squash and cleanup some code.")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>
> Reviewed-by: Juergen Gross <jgross@suse.com>
>


Applied to for-linux-5.16.


-boris