git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
rpaphp_slot.c
diff --git
a/drivers/pci/hotplug/rpaphp_slot.c
b/drivers/pci/hotplug/rpaphp_slot.c
index
8519b9d
..
2bbd87e
100644
(file)
--- a/
drivers/pci/hotplug/rpaphp_slot.c
+++ b/
drivers/pci/hotplug/rpaphp_slot.c
@@
-246,12
+246,7
@@
int rpaphp_get_power_status(struct slot *slot, u8 * value)
{
int rc = 0, level;
{
int rc = 0, level;
- if (slot->type == EMBEDDED) {
- dbg("%s set to POWER_ON for EMBEDDED slot %s\n",
- __FUNCTION__, slot->location);
- *value = POWER_ON;
- }
- else {
+ if (slot->type == HOTPLUG) {
rc = rtas_get_power_level(slot->power_domain, &level);
if (!rc) {
dbg("%s the power level of slot %s(pwd-domain:0x%x) is %d\n",
rc = rtas_get_power_level(slot->power_domain, &level);
if (!rc) {
dbg("%s the power level of slot %s(pwd-domain:0x%x) is %d\n",
@@
-260,6
+255,10
@@
int rpaphp_get_power_status(struct slot *slot, u8 * value)
} else
err("failed to get power-level for slot(%s), rc=0x%x\n",
slot->location, rc);
} else
err("failed to get power-level for slot(%s), rc=0x%x\n",
slot->location, rc);
+ } else {
+ dbg("%s report POWER_ON for EMBEDDED or PHB slot %s\n",
+ __FUNCTION__, slot->location);
+ *value = (u8) POWER_ON;
}
return rc;
}
return rc;