diff options
-rw-r--r-- | drivers/pci/hotplug/ibmphp_res.c | 5 | ||||
-rw-r--r-- | drivers/pci/pci.c | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c index 219ba8090a37..f279060cf6e2 100644 --- a/drivers/pci/hotplug/ibmphp_res.c +++ b/drivers/pci/hotplug/ibmphp_res.c | |||
@@ -376,10 +376,7 @@ int __init ibmphp_rsrc_init (void) | |||
376 | if (rc) | 376 | if (rc) |
377 | return rc; | 377 | return rc; |
378 | } | 378 | } |
379 | rc = once_over (); /* This is to align ranges (so no -1) */ | 379 | return once_over (); /* This is to align ranges (so no -1) */ |
380 | if (rc) | ||
381 | return rc; | ||
382 | return 0; | ||
383 | } | 380 | } |
384 | 381 | ||
385 | /******************************************************************************** | 382 | /******************************************************************************** |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 625a4ace10b4..9a5871f530a7 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1012,11 +1012,7 @@ int pci_save_state(struct pci_dev *dev) | |||
1012 | if (i != 0) | 1012 | if (i != 0) |
1013 | return i; | 1013 | return i; |
1014 | 1014 | ||
1015 | i = pci_save_vc_state(dev); | 1015 | return pci_save_vc_state(dev); |
1016 | if (i != 0) | ||
1017 | return i; | ||
1018 | |||
1019 | return 0; | ||
1020 | } | 1016 | } |
1021 | EXPORT_SYMBOL(pci_save_state); | 1017 | EXPORT_SYMBOL(pci_save_state); |
1022 | 1018 | ||