Patch-mainline: v5.16-rc1

Git-commit: 4745ea2628bb43a7ec34b71763b5a56407b33990

References: git-fixes stable-5.14.19

From: YueHaibing <yuehaibing@huawei.com>

Date: Fri, 8 Oct 2021 15:44:17 +0800

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

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>

Link: https://lore.kernel.org/r/20211008074417.8260-1-yuehaibing@huawei.com

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

Signed-off-by: Juergen Gross <jgross@suse.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.26.2