Commit 46cdc9be authored by françois romieu's avatar françois romieu Committed by David S. Miller

cxgb4: fix usage of uninitialized variable

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c: In function ‘init_one’:
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:4579:8: warning: ‘chip’ may be used uninitialized in this function [-Wmaybe-uninitialized]
   chip |= CHELSIO_CHIP_CODE(CHELSIO_T4, pl_rev);
        ^
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:4571:11: note: ‘chip’ was declared here
  int ver, chip;
           ^

Fixes: d86bd29e ("cxgb4/cxgb4vf: read the correct bits of PL Who Am I register")
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd1a05ee
...@@ -4568,28 +4568,23 @@ static void free_some_resources(struct adapter *adapter) ...@@ -4568,28 +4568,23 @@ static void free_some_resources(struct adapter *adapter)
static int get_chip_type(struct pci_dev *pdev, u32 pl_rev) static int get_chip_type(struct pci_dev *pdev, u32 pl_rev)
{ {
int ver, chip;
u16 device_id; u16 device_id;
/* Retrieve adapter's device ID */ /* Retrieve adapter's device ID */
pci_read_config_word(pdev, PCI_DEVICE_ID, &device_id); pci_read_config_word(pdev, PCI_DEVICE_ID, &device_id);
ver = device_id >> 12;
switch (ver) { switch (device_id >> 12) {
case CHELSIO_T4: case CHELSIO_T4:
chip |= CHELSIO_CHIP_CODE(CHELSIO_T4, pl_rev); return CHELSIO_CHIP_CODE(CHELSIO_T4, pl_rev);
break;
case CHELSIO_T5: case CHELSIO_T5:
chip |= CHELSIO_CHIP_CODE(CHELSIO_T5, pl_rev); return CHELSIO_CHIP_CODE(CHELSIO_T5, pl_rev);
break;
case CHELSIO_T6: case CHELSIO_T6:
chip |= CHELSIO_CHIP_CODE(CHELSIO_T6, pl_rev); return CHELSIO_CHIP_CODE(CHELSIO_T6, pl_rev);
break;
default: default:
dev_err(&pdev->dev, "Device %d is not supported\n", dev_err(&pdev->dev, "Device %d is not supported\n",
device_id); device_id);
return -EINVAL;
} }
return chip; return -EINVAL;
} }
static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment