diff options
| author | Tyler Stachecki <tstache1@binghamton.edu> | 2014-04-25 16:41:04 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-04-28 07:49:25 -0700 |
| commit | af61e27c3f77c7623b5335590ae24b6a5c323e22 (patch) | |
| tree | a80fa6fb7eb32a5ac291dfbe75f4c12906a40beb /drivers/scsi/mpt2sas/mpt2sas_scsih.c | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
| download | talos-obmc-linux-af61e27c3f77c7623b5335590ae24b6a5c323e22.tar.gz talos-obmc-linux-af61e27c3f77c7623b5335590ae24b6a5c323e22.zip | |
[SCSI] mpt2sas: Don't disable device twice at suspend.
On suspend, _scsih_suspend calls mpt2sas_base_free_resources, which
in turn calls pci_disable_device if the device is enabled prior to
suspending. However, _scsih_suspend also calls pci_disable_device
itself.
Thus, in the event that the device is enabled prior to suspending,
pci_disable_device will be called twice. This patch removes the
duplicate call to pci_disable_device in _scsi_suspend as it is both
unnecessary and results in a kernel oops.
Signed-off-by: Tyler Stachecki <tstache1@binghamton.edu>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_scsih.c')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 7f0af4fcc001..6fd7d40b2c4d 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@ -8293,7 +8293,6 @@ _scsih_suspend(struct pci_dev *pdev, pm_message_t state) mpt2sas_base_free_resources(ioc); pci_save_state(pdev); - pci_disable_device(pdev); pci_set_power_state(pdev, device_state); return 0; } |
