From: Tyler Stachecki Date: Fri, 25 Apr 2014 20:41:04 +0000 (-0400) Subject: [SCSI] mpt2sas: Don't disable device twice at suspend. X-Git-Tag: omap-for-v3.16/pm-signed~12^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af61e27c3f77c7623b5335590ae24b6a5c323e22;p=pandora-kernel.git [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 Cc: stable@vger.kernel.org Signed-off-by: James Bottomley --- Reading git-diff-tree failed