scsi: smartpqi: Fix NUMA node not updated during init

Correct NUMA node association when calling pqi_pci_probe().

In the function pqi_pci_probe(), the driver makes an OS call to get the
NUMA node associated with a controller. If the call returns that there is
no associated node, the driver attempts to set it to node 0. The problem is
that a different local variable (cp_node) was being used to do this, but
the original local variable (node) was still being used in the call to
pqi_alloc_ctrl_info().

The value of "node" is not updated if the conditional after the call to
dev_to_node() evaluates to TRUE.

Link: https://lore.kernel.org/r/164375213850.440833.5243014942807747074.stgit@brunhilda.pdev.net
Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Mike McGowen <Mike.McGowen@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 76ad919b0812bf2ac70de6ad145e922f4045a605..d886a9c860af65d4fe92e386b0ca0562a15a143a 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -8811,7 +8811,7 @@ static int pqi_pci_probe(struct pci_dev *pci_dev,
        const struct pci_device_id *id)
 {
        int rc;
-       int node, cp_node;
+       int node;
        struct pqi_ctrl_info *ctrl_info;
 
        pqi_print_ctrl_info(pci_dev, id);
@@ -8830,10 +8830,10 @@ static int pqi_pci_probe(struct pci_dev *pci_dev,
 
        node = dev_to_node(&pci_dev->dev);
        if (node == NUMA_NO_NODE) {
-               cp_node = cpu_to_node(0);
-               if (cp_node == NUMA_NO_NODE)
-                       cp_node = 0;
-               set_dev_node(&pci_dev->dev, cp_node);
+               node = cpu_to_node(0);
+               if (node == NUMA_NO_NODE)
+                       node = 0;
+               set_dev_node(&pci_dev->dev, node);
        }
 
        ctrl_info = pqi_alloc_ctrl_info(node);