git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
scsi
/
mpt2sas
/
mpt2sas_scsih.c
diff --git
a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index
7f0af4f
..
6fd7d40
100644
(file)
--- 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;
}