Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / firewire / ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index c2f5117fd8cb00c48f42784dcef9c97ebaa92080..8bf89267dc252f260a3fc6e640c0c1809f04ef2d 100644 (file)
--- 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;
        }
 
        /*