From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 1 Nov 2015 14:52:13 +0000 (+0100)
Subject: firewire: ohci: propagate return code from soft_reset to probe and resume
X-Git-Tag: next-20160301~81^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a354cf00c71390c46927335fe20b65f38a528b59;p=karo-tx-linux.git

firewire: ohci: propagate return code from soft_reset to probe and resume

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 <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index c2f5117fd8cb..8bf89267dc25 100644
--- 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;
 	}
 
 	/*