diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-20 08:32:20 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-20 08:32:20 -0700 |
| commit | d7b33ebae7c1419ebdfd94eb64bf74a7ec760031 (patch) | |
| tree | 67dbc2149bb00e2eaf89c31a515e1f8bfc0dc8cb /drivers/scsi/3w-sas.c | |
| parent | e1d176680ed4f6970582086191eb7377a80a2d4e (diff) | |
| parent | 1244bbb3e92135d247e2dddfa6fe5e3e171a9635 (diff) | |
Merge tag 'v4.14.71' into linux-linaro-lsk-v4.14
This is the 4.14.71 stable release
Diffstat (limited to 'drivers/scsi/3w-sas.c')
| -rw-r--r-- | drivers/scsi/3w-sas.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index b150e131b2e7..aa317d6909e8 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -1597,6 +1597,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) if (twl_initialize_device_extension(tw_dev)) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Failed to initialize device extension"); + retval = -ENOMEM; goto out_free_device_extension; } @@ -1611,6 +1612,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->base_addr = pci_iomap(pdev, 1, 0); if (!tw_dev->base_addr) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1c, "Failed to ioremap"); + retval = -ENOMEM; goto out_release_mem_region; } @@ -1620,6 +1622,7 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) /* Initialize the card */ if (twl_reset_sequence(tw_dev, 0)) { TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1d, "Controller reset failed during probe"); + retval = -ENOMEM; goto out_iounmap; } |