Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53364
b: refs/heads/master
c: 3499f07
h: refs/heads/master
v: v3
  • Loading branch information
Linas Vepstas authored and Greg Kroah-Hartman committed May 3, 2007
1 parent c5926db commit 1fd0876
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5fd39c35a016150e93b68c472a04b2d4b5574a2b
refs/heads/master: 3499f0726ec179afd19669070681ac457d27033f
6 changes: 2 additions & 4 deletions trunk/drivers/pci/hotplug/rpaphp_slot.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,13 @@ int rpaphp_register_slot(struct slot *slot)
/* should not try to register the same slot twice */
if (is_registered(slot)) {
err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
retval = -EAGAIN;
goto register_fail;
return -EAGAIN;
}

retval = pci_hp_register(php_slot);
if (retval) {
err("pci_hp_register failed with error %d\n", retval);
goto register_fail;
return retval;
}

/* create "phy_location" file */
Expand All @@ -182,7 +181,6 @@ int rpaphp_register_slot(struct slot *slot)

sysfs_fail:
pci_hp_deregister(php_slot);
register_fail:
return retval;
}

Expand Down

0 comments on commit 1fd0876

Please sign in to comment.