From 8160b09b4438581d96dd7b770ab605b7dd6f6040 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 11 Jul 2011 14:08:25 -0700 Subject: [PATCH] --- yaml --- r: 261715 b: refs/heads/master c: f170c684b55cb8d3bab55b1fb8fa812778d551f2 h: refs/heads/master i: 261713: 4e764a0362cf62d2437e9af2759602d80f3c5a00 261711: af70a55229013c3aed24e43c5fdc04ee4b5030a0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b89987d80549..9332052c6632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5b515445f4f5a905c5dd27e6e682868ccd6c09d +refs/heads/master: f170c684b55cb8d3bab55b1fb8fa812778d551f2 diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index 888086c4e709..8d636301e32c 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -8778,14 +8778,14 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, if (rc != PCIBIOS_SUCCESSFUL) { dev_err(&pdev->dev, "Failed to save PCI config space\n"); rc = -EIO; - goto cleanup_nomem; + goto out_msi_disable; } if ((rc = ipr_save_pcix_cmd_reg(ioa_cfg))) - goto cleanup_nomem; + goto out_msi_disable; if ((rc = ipr_set_pcix_cmd_reg(ioa_cfg))) - goto cleanup_nomem; + goto out_msi_disable; if (ioa_cfg->sis64) ioa_cfg->cfg_table_size = (sizeof(struct ipr_config_table_hdr64) @@ -8800,7 +8800,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, if (rc < 0) { dev_err(&pdev->dev, "Couldn't allocate enough memory for device driver!\n"); - goto cleanup_nomem; + goto out_msi_disable; } /* @@ -8845,10 +8845,10 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, cleanup_nolog: ipr_free_mem(ioa_cfg); -cleanup_nomem: - iounmap(ipr_regs); out_msi_disable: pci_disable_msi(pdev); +cleanup_nomem: + iounmap(ipr_regs); out_release_regions: pci_release_regions(pdev); out_scsi_host_put: