Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6.git] / drivers / scsi / lpfc / lpfc_init.c

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 09a9c8ab2eae2d480bcce6129e02d329a329a8bd..dcf6106f557a0dac93efb20710dcbf9d1bec7bc7 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1817,10 +1817,9 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring  *pring;
 
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring  *pring;
 

-       if (state == pci_channel_io_perm_failure) {
-               lpfc_pci_remove_one(pdev);
+       if (state == pci_channel_io_perm_failure)

                return PCI_ERS_RESULT_DISCONNECT;
                return PCI_ERS_RESULT_DISCONNECT;

-       }
+

        pci_disable_device(pdev);
        /*
         * There may be I/Os dropped by the firmware.
        pci_disable_device(pdev);
        /*
         * There may be I/Os dropped by the firmware.