[SCSI] mpt2sas: Don't disable device twice at suspend.

Tyler Stachecki · James Bottomley · commit af61e27c3f77 · 2014-04-28T07:49:25.000-07:00
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 &lt;tstache1@binghamton.edu&gt;
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley &lt;JBottomley@Parallels.com&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -8293,7 +8293,6 @@ _scsih_suspend(struct pci_dev *pdev, pm_message_t state)`
`8293`	`8293`
`8294`	`8294`	`mpt2sas_base_free_resources(ioc);`
`8295`	`8295`	`pci_save_state(pdev);`
`8296`		`- pci_disable_device(pdev);`
`8297`	`8296`	`pci_set_power_state(pdev, device_state);`
`8298`	`8297`	`return 0;`
`8299`	`8298`	`}`