diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 18:53:47 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 18:53:47 (GMT) |
| commit | e3414786ffb40a1fd524624369d350ed70a90a08 (patch) | |
| tree | b4247a5e7c2335e9fa8b2ab6ac57ede3d2576f52 /drivers/pci/hotplug/rpaphp_pci.c | |
| parent | b0e3636f656c98bdeded5aaa78601e3256b18d6d (diff) | |
| parent | e7cc5cf74544d97d7b69e2701595037474db1f96 (diff) | |
| download | linux-fsl-qoriq-e3414786ffb40a1fd524624369d350ed70a90a08.tar.xz | |
Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas:
"Miscellaneous
- Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
- Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"
* tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
PCI: Fix whitespace, capitalization, and spelling errors
Diffstat (limited to 'drivers/pci/hotplug/rpaphp_pci.c')
| -rw-r--r-- | drivers/pci/hotplug/rpaphp_pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c index 513e1e2..9243f3e7 100644 --- a/drivers/pci/hotplug/rpaphp_pci.c +++ b/drivers/pci/hotplug/rpaphp_pci.c @@ -44,7 +44,7 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state) dbg("%s: slot must be power up to get sensor-state\n", __func__); - /* some slots have to be powered up + /* some slots have to be powered up * before get-sensor will succeed. */ rc = rtas_set_power_level(slot->power_domain, POWER_ON, @@ -133,4 +133,3 @@ int rpaphp_enable_slot(struct slot *slot) return 0; } - |