mpt2sas: Don't disable device twice at suspend.
authorTyler Stachecki <tstache1@binghamton.edu>
Fri, 25 Apr 2014 20:41:04 +0000 (16:41 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 May 2014 12:11:30 +0000 (14:11 +0200)
commita2295c4263fe35f674f0061fe0419c73238d5b5b
tree15b88f2cad71f1a4d95619176f6b245f48edf0c4
parent983327a48a263bd65fa869a0aad76baaf75fff86
mpt2sas: Don't disable device twice at suspend.

commit af61e27c3f77c7623b5335590ae24b6a5c323e22 upstream.

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>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/mpt2sas/mpt2sas_scsih.c