| From 1bb54023faa5bf842c0e63a2e5a13d88ce434aeb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 2 Aug 2020 19:15:44 +0800 |
| Subject: liquidio: Fix wrong return value in cn23xx_get_pf_num() |
| |
| From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> |
| |
| [ Upstream commit aa027850a292ea65524b8fab83eb91a124ad362c ] |
| |
| On an error exit path, a negative error code should be returned |
| instead of a positive return value. |
| |
| Fixes: 0c45d7fe12c7e ("liquidio: fix use of pf in pass-through mode in a virtual machine") |
| Cc: Rick Farrington <ricardo.farrington@cavium.com> |
| Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c |
| index 43d11c38b38a9..4cddd628d41b2 100644 |
| --- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c |
| +++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c |
| @@ -1167,7 +1167,7 @@ static int cn23xx_get_pf_num(struct octeon_device *oct) |
| oct->pf_num = ((fdl_bit >> CN23XX_PCIE_SRIOV_FDL_BIT_POS) & |
| CN23XX_PCIE_SRIOV_FDL_MASK); |
| } else { |
| - ret = EINVAL; |
| + ret = -EINVAL; |
| |
| /* Under some virtual environments, extended PCI regs are |
| * inaccessible, in which case the above read will have failed. |
| -- |
| 2.25.1 |
| |
