firewire: ohci: propagate return code from soft_reset to probe and re…

…sume software_reset() may fail - due to unresponsive chip with -EBUSY (-16), or - due to ejected or unseated card with -ENODEV (-19). Let the PCI probe and resume routines log the actual error code instead of hardwired -EBUSY. Signed-off-by: Stefan Richter <[email protected]>
opendata26 · Nov 5, 2015 · a354cf0 · a354cf0
1 parent 2ae4b6b
commit a354cf0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
@@ -2278,9 +2278,10 @@ static int ohci_enable(struct fw_card *card,
 	u32 lps, version, irqs;
 	int i, ret;
 
-	if (software_reset(ohci)) {
+	ret = software_reset(ohci);
+	if (ret < 0) {
 		ohci_err(ohci, "failed to reset ohci card\n");
-		return -EBUSY;
+		return ret;
 	}
 
 	/*