From: Wei Yongjun <[email protected]> Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <[email protected]> --- drivers/scsi/3w-xxxx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index b9276d1..3b9c01e 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -2315,7 +2315,8 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->host = host; tw_dev->tw_pci_dev = pdev; - if (tw_initialize_device_extension(tw_dev)) { + retval = tw_initialize_device_extension(tw_dev); + if (retval) { printk(KERN_WARNING "3w-xxxx: Failed to initialize device extension."); goto out_free_device_extension; } @@ -2331,6 +2332,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) tw_dev->base_addr = pci_resource_start(pdev, 0); if (!tw_dev->base_addr) { printk(KERN_WARNING "3w-xxxx: Failed to get io address."); + retval = -EIO; goto out_release_mem_region; } @@ -2338,7 +2340,8 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) TW_DISABLE_INTERRUPTS(tw_dev); /* Initialize the card */ - if (tw_reset_sequence(tw_dev)) + retval = tw_reset_sequence(tw_dev); + if (retval) goto out_release_mem_region; /* Set host specific parameters */ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
