Commit af61e27c authored Apr 25, 2014 by Tyler Stachecki Committed by James Bottomley Apr 28, 2014

[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>

parent d1db0eea

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}